updated uml
Merge branch 'master' of https://github.com/CMPUT-301F14T10/project