edited and included diagram
Merge branch 'master' of https://github.com/theedkay/oop-cw