diff --git a/blogapp/views.py b/blogapp/views.py
index 4ef418f..93a9bd1 100644
--- a/blogapp/views.py
+++ b/blogapp/views.py
@@ -3,6 +3,11 @@ from django.shortcuts import render, get_object_or_404
 from django.template import RequestContext
 from django import forms
 import datetime
+import mistune
+
+class CustomRenderer(mistune.Renderer):
+    def image(self, src, title, alt_text):
+        return '<div id="textimg"><img src="' + src + '"/><br>Title: ' + title + '<br>Alt: ' + alt_text + '</div>'
 
 class BlogCommentForm(forms.Form):
     guestname = forms.CharField()
@@ -16,6 +21,9 @@ def listall(request):
 
 def detail(request, blogentry_id):
     blogdetail = get_object_or_404(blogentry, pk=blogentry_id)
+    renderer = CustomRenderer()
+    md = mistune.Markdown(renderer = renderer, hard_wrap = True)
+    blogdetail.body = md(blogdetail.body)
 
     form = BlogCommentForm()
     context = {'blogentry': blogdetail, 'commentform': form}
diff --git a/db.sqlite3 b/db.sqlite3
index 92cace2..5387b9a 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/imageapp/admin.py b/imageapp/admin.py
index 2b5364c..4542ba7 100644
--- a/imageapp/admin.py
+++ b/imageapp/admin.py
@@ -10,7 +10,7 @@ class BlogImageAdminForm(forms.ModelForm):
 
 class BlogImageAdmin(admin.ModelAdmin):
 	form = BlogImageAdminForm
-	list_display = ('date', )
+	list_display = ('id', 'caption')
 
 admin.site.register(BlogImage, BlogImageAdmin)
 
diff --git a/polysite/settings.py b/polysite/settings.py
index 0bbe9e6..fd27e4f 100644
--- a/polysite/settings.py
+++ b/polysite/settings.py
@@ -128,3 +128,6 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static"),
 ]
+
+MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+MEDIA_URL = 'http://127.0.0.1:8000/media/'
diff --git a/static/general.css b/static/general.css
index 63ffb57..74b3519 100644
--- a/static/general.css
+++ b/static/general.css
@@ -44,7 +44,7 @@ div#main{
 	padding-top: 1em;
 }
 
-img#intext{
+div#textimg{
 	padding-top:1em;
 
 	display: block;