Merge branch 'story86-3D' into story77_lobby

# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml

racevisionGame/src/main/java/visualiser/Controllers/HostController.java

@@ -6,8 +6,10 @@ import javafx.scene.control.ButtonType;
 import javafx.scene.control.SplitPane;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
 import mock.app.Event;
 import mock.exceptions.EventConstructionException;
+import visualiser.model.View3D;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -44,11 +46,18 @@ public class HostController extends Controller {
     @FXML
     AnchorPane specPane;
 
+    @FXML
+    GridPane playerContainer;
+
     private Event game;
 
+    private View3D fancyStuff;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        fancyStuff = new View3D();
+        playerContainer.add(fancyStuff, 0,0);
+        fancyStuff.spinBox();
     }
 
     /**

racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java

@@ -21,7 +21,7 @@ import java.util.ResourceBundle;
 public class LobbyController extends Controller {
 
     @FXML
-    AnchorPane lobbyWrapper;
+    private AnchorPane lobbyWrapper;
     @FXML
     private TableView<RaceConnection> lobbyTable;
     @FXML

racevisionGame/src/main/java/visualiser/Controllers/TitleController.java

@@ -81,7 +81,6 @@ public class TitleController extends Controller {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
     }
 
     /**