improve styling of home page
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
improve styling of homepage after merge