added shapes
Merge branch 'development' into testing
remove bad file