solving conflict

.idea/$PRODUCT_WORKSPACE_FILE$

.idea/.gitignore

.idea/misc.xml

.idea/modules.xml

.idea/workspace.xml

comp90015-dsass2-infinitymonkeys-remaster.iml

...15-dsass2-infinitymonkeys-remaster/GUI/ChatScreen$1.class

...0015-dsass2-infinitymonkeys-remaster/GUI/ChatScreen.class

...15-dsass2-infinitymonkeys-remaster/GUI/ColorPallete.class

...5-dsass2-infinitymonkeys-remaster/GUI/DrawingArea$1.class

...sass2-infinitymonkeys-remaster/GUI/DrawingArea$Mode.class

...015-dsass2-infinitymonkeys-remaster/GUI/DrawingArea.class

...mp90015-dsass2-infinitymonkeys-remaster/GUI/MenuBar.class

...0015-dsass2-infinitymonkeys-remaster/GUI/PaintGUI$1.class

...p90015-dsass2-infinitymonkeys-remaster/GUI/PaintGUI.class

...5-dsass2-infinitymonkeys-remaster/GUI/StartScreen$1.class

...015-dsass2-infinitymonkeys-remaster/GUI/StartScreen.class

...mp90015-dsass2-infinitymonkeys-remaster/GUI/ToolBar.class

...comp90015-dsass2-infinitymonkeys-remaster/GUI/Tools.class

...duction/comp90015-dsass2-infinitymonkeys-remaster/LICENSE