local
Merge branch 'gh-pages' of github.com:EdisonReklamebyraa/gautefalltomter into gh-pages

Conflicts:
	css/style.css