merging local machine
Merge branch 'master' of https://github.com/CMPUT301W14T12/GeoChan