fixed up errors in the location merge. All functionality should be there
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan