testing post rendering
Merge branch 'master' of github.com:benwerd/indiereader

Conflicts:
	controllers/controllers.php