Made an edit to the UML chart
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Added a few relations in the UML
Fixed the edit so it now works properly.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project