SoundEffects finished, music added
Merge branch 'master' of https://github.com/timtheonly/group-project