fixed the blog post display issue
Merge branch 'master' into workingBlog
Merge branch 'master' of https://github.com/eduncan26/lavalsPieShop

Conflicts:
	content/views.py
	lavalsPieShop/settings.py
	lavalsPieShop/urls.py