merged
Merge branch 'master' of https://github.com/jokeofweek/logyourday

Conflicts:
	app/controllers/posts_controller.rb
	app/models/post.rb