fix conflict
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