Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
resolved conflict
Weird merge
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages

Conflicts:
	Elvisualisering/index.html
notes
resolved conflict
Changed font-size in buttons