made some stuff, broke some things
Merge branch 'classdiag' of https://github.com/dannylam/ogretel.git into classdiag