skriveleif - test
test
Merge branch 'master' of https://github.com/ladabil/simuleringGUI.git

Conflicts:
	hidden/templates/wizard.tpl.html