Merge pull request #42 from ZooTypers/master

updating to test vibration
minor refactoring and fixed issue with game music playing when loading
Merge pull request #232 from winglam/master

minor refactoring and fixed issue with game music playing when loading