Merging game lobby with game state broadcast

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

@@ -157,7 +157,7 @@ public class LobbyController implements Initializable, Observer{
             if (competitorIndex >= 8) {
                 break;
             }
-            if (!yachtId.equals(ClientState.getClientSourceId())) {
+            if (!yachtId.equals(Integer.parseInt(ClientState.getClientSourceId()))) {
                 competitors.get(competitorIndex).add(String.valueOf(yachtId));
                 competitorIndex++;
             }

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -351,7 +351,7 @@ public class ServerToClientThread implements Runnable {
         }
     }
 
-    }
+
 
 
     public Thread getThread() {