Merge pull request #60 from ibarreto/master

implemented upvote answer and question
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk