Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
playerDelay=20s and cleaned up player code
changed player to include start screen
Merge branch 'master' of https://github.com/JohanEks/testrepo

Conflicts:
	Elvisualisering/index.html