trololol
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hovedside/css/main.css
	Hovedside/html/index.html