blahhr3ygewfhugsdhiogdwehufwqjopifeqojifeq
Merge remote-tracking branch 'origin/front-end-shit' into front-end-shit

Conflicts:
	app/views/home/_homepage.html.erb