Comment on some things
Merge pull request #203 from CMPUT301F14T14/newLocationBranch

Comment on some things