Music stops playing when game has stopped
Merge branch 'master' into gh-pages