changes to buttons and music
Merge branch 'master' of http://github.com/jakedarling/magicflight