Index: design/multipleGameDesign.txt
===================================================================
--- design/multipleGameDesign.txt	(revision b4c5b6ac537df952036c2144bb4926685f691175)
+++ design/multipleGameDesign.txt	(revision 3d6f78fd8321e2aed5990a18aa49d1e83f79ad33)
@@ -6,2 +6,4 @@
 
 There should be a new LOBBY state the player goes to after logging in, which lets him create a game and view all created games. There should also be a button to let him go to the current "global" game.
+
+The client only has one game object, which is the game the client is currently in (or MILL if the client is in the lobby). The mapGames of the client maps game names to number of players in each game.
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision b4c5b6ac537df952036c2144bb4926685f691175)
+++ server/server.cpp	(revision 3d6f78fd8321e2aed5990a18aa49d1e83f79ad33)
@@ -1095,5 +1095,5 @@
          Player* p = findPlayerByAddr(mapPlayers, from);
          p->team = rand() % 2; // choose a random team (either 0 or 1)
-         p->currentGame = g;
+         p->currentGame = g; // should have been done in JOIN_GAME, so not necessary
 
          map<unsigned int, Player*>& otherPlayers = g->getPlayers();