broken
closes #18: combines shapes/elements/pencil into one big box; also some cleanup and stuff
cleanup after combining shapes and elements
radio button fits
Merge branch 'master' of github.com:acrabb/businessOnesies