Merge remote-tracking branch 'origin/gamelogic-sprint4' into gui-sprint4
Fixed typo
Fixed bug in sound effects
Game rule settings, but commented out for the merge
Merge remote-tracking branch 'origin/gamelogic-sprint4' into gui-sprint4
Updated class diagram
Updated Project Plan
Merge remote-tracking branch 'origin/master' into gamelogic-sprint4
Fixed order of ConnectionHandler to avoid NullPointerException