Merge pull request #28 from 0nebit/master

Fixed merge problem.
Chuan/Chris - added connectivity checker class.
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk