nå funker testen igjen
Merge branch 'master' of https://github.com/hkjersem/specifique

Conflicts:
	js/main-min.js