alright, poop fixed now
Merge remote-tracking branch 'origin/master' into landonMOE
music now pauses when round ends