geo
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
geolocation on answer questions and reply
fix conflict
Merge pull request #106 from diego04/master

geolocation on question answer and reply