player + a few scrolling changes
Merge branch 'master' of https://github.com/skogler/storyofanerd
Merge branch 'master' of https://github.com/skogler/storyofanerd