Delayed the victory music so that it doesn't overlap the tada music.
Text now appears on screen.
Fixed merge error.
Fixed merge errors and fixed start of game setup.
Merge pull request #10 from db4soundman/master

Text now.