Added header and hero.
Merge branch 'header'

Conflicts:
	.sass-cache/820a293a16da00f2c138c1980a1fa0a1ce96040c/base.scssc
	.sass-cache/820a293a16da00f2c138c1980a1fa0a1ce96040c/nav.scssc
	css/style.css