begun tweaking Shapes
fixed merge conflicts
fix merge conflicts
Merge branch 'master' of https://github.com/fwumdegames/FwumDeAPI