Make some style corrections.
Conflicts:
	app/assets/stylesheets/albums.css.scss
	app/assets/stylesheets/application.css.scss