changes in home.scss and base.scss
Merge branch 'master' into Banner

Conflicts:
	assets/stylesheets/globals/_base.scss