updated Observable class in UML
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project

This merge is merging the updated UML
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project