Added shape genorators
Removed all the rubbish
Some bug fixes
Some bug fixes
Removed all the rubbish
Merge branch 'master' of github.com:olls/graphics