More documentation
Merge pull request #208 from CMPUT301F14T14/newLocationBranch

More documentation