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
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
resolved conflict
changed player to include start screen
Weird merge
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages

Conflicts:
	Elvisualisering/index.html
notes
Merge branch 'master' of https://github.com/JohanEks/testrepo

Conflicts:
	Elvisualisering/index.html
Changed size of call-to-action buttons
Merge remote-tracking branch 'origin/player'
resolved conflict
Changed font-size in buttons
Changed size of startview
Changed size of i's and their texts
Changed to more dynamic layout of start-view