edited css
Merge branch 'filling-in-layout'

* filling-in-layout:
  edited css

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