fixed conflict
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #104 from diego04/master

fix merge conflicts