Merge pull request #103 from diego04/master

latitude longitude in questions
fixed conflict
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk