Added ability to toggle between states. Added circle and boxes state.
Merge branch 'master' of github.com:JoshuaBrookover/Physics2D