merged in Matt's changes
Added Points for Bounding Boxes. Merged in other changes
Merge branch 'master' of https://github.com/smflorentino/whiteboarder