Conflicts solved

src/client/Client.java

@@ -80,7 +80,7 @@ public class Client
             chatController = (IChatController) registryServer.lookup("ChatController");
             clientController = (IClientController) registryServer.lookup("ClientController");
 
-            if (clientController.join(userName, this.chatUpdate))
+            if (clientController.join(userName, this.chatUpdate, this.drawingUpdate))
             {
                 System.out.println("Connected to server");