UML diagram
Merge pull request #1 from daverboy23/master

blahblahb