feed.html.erb
Merge branch 'master' of https://github.com/DaemonDashHackathon/CrazyTrain

Conflicts:
	app/models/post.rb
	app/views/posts/feed.html.erb