pre merge
Merge branch 'master' of https://github.com/kevineger/mood_master

Conflicts:
	app/controllers/posts_controller.rb
	app/views/posts/show.html.erb
	config/routes.rb