changed UML a bit
Merge branch 'JUnitTests' of https://github.com/CMPUT301F14T09/Team09Project into JUnitTests