UML updated
Merge https://github.com/CMPUT-301F14T10/project