Throwing in my part as well
Not falling for that again
Merge branch 'feed_views'

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/base.css.scss