Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

Assets/Scenes/Server Scenes/Lobby.unity

@@ -587,7 +587,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Clients: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
-  SceneToStart: ServerTestScene
+  SceneToStart: ColourCollide_Smaller
   IPText: {fileID: 910932172}
   Content: {fileID: 1584683394}
   ClientTag: {fileID: 263791918}

Assets/Scripts/Networking/Server/ServerObject.cs

@@ -29,6 +29,8 @@ namespace Networking.Server {
 
         public void StartServer(int port)
         {
+            LoginHandler.ConnectedClients.Clear();
+            LoginHandler.DisconnectedClients.Clear();
             Debug.Log("Starting Server on " + port);
             server = new NetworkServerSimple();
 
@@ -43,10 +45,5 @@ namespace Networking.Server {
             if (server != null)
                 server.Update();
         }
-
-
-
-
-
     }
 }