gg
Merge branch 'master' of https://github.com/henryyang42/Canvas.git

Conflicts:
	src/nthu/cs/henryyang42/canvas/CanvasView.java