Adjust
Merge branch 'master' of https://github.com/ekoziol/splate

Conflicts:
	app/controllers/posts_controller.rb