test
Merge branch 'master' of https://github.com/Skallerup/Skitz

Conflicts:
	css/style.css
Ikoner tilføjet
Merge branch 'master' of https://github.com/Skallerup/Skitz