Merge remote-tracking branch 'origin/master' into production

Conflicts:
	app/views/songs/show.html.erb
Merge branch 'master' into production

Conflicts:
	app/views/songs/show.html.erb
Changed responsive layout to better fit mobile.
Changed default btn-primary background color and border color