Weird merge
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages

Conflicts:
	Elvisualisering/index.html