class diagram included
Merge branch 'master' of https://github.com/stinger907/OOPTeamwork
some colorization added by Kaloyan