Redoing uml using UMLet
Finished view classes in UML, working on controller classes
Finished controller classes in UML
Finished Controllers, working on Model classes
Finished Model classes in UML - adding aggregation arrows
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
Finished aggregation arrows between models, views, and controllers in UML
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
commented out code for jeff, just ctrl-f JEFF to find it
omg, merge conflict