Updated WaitingMusic classes

Adds more waiting music
got rid of old waitingmusic class