Added music and markers, commented out because of http error
Merge branch 'master' of https://github.com/2machten/pixel-evolution