ADDED SHAPES and things and whatnot with stuff
Merge remote-tracking branch 'origin/ShapeTool' into ClientServerComm

Conflicts:
	client/Whiteboard.js