Sound effects/music branch with conflicts with master resolved

You're right! Removed.