can paint smoothly and paint dots
Merge branch 'master' of https://github.com/allenxyz/ditto

Conflicts:
	bin/.gitignore
	bin/eecs285/proj4/server/Client.class
	bin/eecs285/proj4/server/MainFile$1.class
	bin/eecs285/proj4/server/MainFile$2.class
	bin/eecs285/proj4/server/MainFile.class
	bin/eecs285/proj4/server/Server.class