Stuff.
Merge branch 'master' of https://github.com/Fumler/blog-cms

Conflicts:
	pages/viewpost.php