Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision 3ea1839b0ef52feb64695e7636ed5521d667953f)
+++ common/Game.cpp	(revision ea172819f2f3e0c4115a48d26b882807f0c90490)
@@ -43,5 +43,5 @@
 }
 
-bool Game::addPlayer(Player* p) {
+bool Game::addPlayer(Player* p, bool serverSide) {
    if (players.find(p->getId()) == players.end()) {
       players[p->getId()] = p;
@@ -58,6 +58,8 @@
       p->hasRedFlag = false;
 
-      // choose a random team (either 0 or 1)
-      p->team = rand() % 2;
+      if (serverSide) {
+         // choose a random team (either 0 or 1)
+         p->team = rand() % 2;
+      }
 
       p->currentGame = this;
Index: common/Game.h
===================================================================
--- common/Game.h	(revision 3ea1839b0ef52feb64695e7636ed5521d667953f)
+++ common/Game.h	(revision ea172819f2f3e0c4115a48d26b882807f0c90490)
@@ -49,5 +49,5 @@
 
    map<unsigned int, Player*>& getPlayers();
-   bool addPlayer(Player* p);
+   bool addPlayer(Player* p, bool serverSide);
    bool removePlayer(unsigned int id);
 
Index: common/MessageProcessor.cpp
===================================================================
--- common/MessageProcessor.cpp	(revision 3ea1839b0ef52feb64695e7636ed5521d667953f)
+++ common/MessageProcessor.cpp	(revision ea172819f2f3e0c4115a48d26b882807f0c90490)
@@ -50,7 +50,7 @@
 
    // assume we don't care about the value of socklen
-   cout << "Waiting for message from server" << endl;
+   //cout << "Waiting for message from server" << endl;
    int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)source, &socklen);
-   cout << "Returned from wait" << endl;
+   //cout << "Returned from wait" << endl;
 
    if (ret == -1)