header and footer
Merge branch 'master' of https://github.com/Quins/deadchill

Conflicts:
	public/css/_fonts.scss
	public/css/common.scss