Replaced background music with Shadowman music
Merge branch 'dev' into feature-terry
Re-added background music
Merge remote-tracking branch 'origin/dev' into feature-emlowry2