Adding in main music loop and fix for SoundSystem
Merge remote-tracking branch 'origin/master'