WHY
PUSSHHHHHHHH

Conflicts:
	app/models/post.rb
	app/views/posts/show.html.erb
	db/schema.rb