conflicts solved in chatscreen

src/GUI/ChatScreen.java

src/GUI/PaintGUI.java

src/client/Client.java

src/client/DrawingUpdate.java

src/remote/IClientController.java

src/remote/IUpdateController.java

src/server/ClientController.java

src/server/Server.java

src/server/User.java