Redesign Home Page
Merge branch 'master' into ewdesign

Conflicts:
	app/assets/stylesheets/songs.css.scss