Clean

Clean source code & update logic
Merge branch 'master' of https://github.com/isac322/paint

Conflicts:
	src/paint/PaintCanvas.java