shapes add, resize
merge conflict
added jCanvas
Merge branch 'shapes'