created branch for my code
Merge branch 'branch' of https://github.com/CS305JSX/PaintProject305 into dev-hx

Conflicts:
	src/ClientListenerThread.java
	src/PaintApplet.java
	src/PaintFrame.java
	src/PaintServer.java
	src/SidePanel.java