hei og tall
Merge branch 'master' of https://github.com/jarandm/Gittest

Conflicts:
	index.html