Merge branch 'master' of
ssh://git@github.com/jessicayuen/CMPUT301T13.git
added comments to classes for clarification