altered UML
Merge branch 'master' of https://github.com/twendlandt/Assignment1