new Box
Merge branch 'master' of https://github.com/avigaildavid/dev

Conflicts:
	canvas/shapes.html
	canvas/shapes.js