Refactored
Merge branch 'master' of github.com:CMPUT301W14T12/GeoChan