fix conflict
Merge pull request #108 from aktse/master

deleted dead code
added location to answers
only need to sort by geolocation then done
pull only need to sort geo
Merge pull request #109 from diego04/master

Only need to implement sorting geo then done
deleted dead code, added comments
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk