Merging game lobby with game state broadcast. Merge conflicts resolved.

Port numbers updated to 4942.

src/main/java/seng302/controllers/LobbyController.java

@@ -220,6 +220,7 @@ public class LobbyController implements Initializable, Observer{
 
     @FXML
     public void readyButtonPressed() {
+        setContentPane("/views/RaceView.fxml");
         GameState.setCurrentStage(GameStages.RACING);
     }