Progress on UML
More progress on UML
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project