merge test
Merge branch 'master' of https://github.com/christoferolaison/stjarnvik_sateri

Conflicts:
	script/frontend.js