Merge branch 'Jason-Branch'
Remove music delay
Merge branch 'master' into Jason-Branch