adding name and data flags to base shapes
Merge branch 'master' of github.com:underscorediscovery/hxcollision