Merge pull request #107 from aktse/master

updated some test cases
deleted dead code
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk