Fixed merging bugs

.idea/workspace.xml

infinitymonkeys.iml

out/production/infinitymonkeys/GUI/ChatScreen$1.class

out/production/infinitymonkeys/GUI/ChatScreen.class

out/production/infinitymonkeys/GUI/DrawingArea$1.class

out/production/infinitymonkeys/GUI/DrawingArea$2.class

out/production/infinitymonkeys/GUI/DrawingArea.class

out/production/infinitymonkeys/GUI/PaintGUI$1.class

out/production/infinitymonkeys/GUI/PaintGUI$2.class

out/production/infinitymonkeys/GUI/PaintGUI.class

out/production/infinitymonkeys/GUI/StartScreen$2.class

out/production/infinitymonkeys/GUI/StartScreen$3.class

out/production/infinitymonkeys/GUI/StartScreen.class

out/production/infinitymonkeys/circle.png

out/production/infinitymonkeys/client/Client.class

out/production/infinitymonkeys/eraser.png

out/production/infinitymonkeys/freehand.png

out/production/infinitymonkeys/line.png

out/production/infinitymonkeys/oval.png

out/production/infinitymonkeys/palette.png