rearranged some stuff, fixed properties
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #79 from aktse/master

fixed properties