Updates håvard end of day
Merge branch 'header'

Conflicts:
	app/index.html
	app/styles/base/_scaffold.scss
	app/styles/modules/_modules.scss
	dist/article.html
	dist/index.html
	dist/styles/main.css