pair programming for now ivan aaron neel
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
implemented object classes
stuff
Merge pull request #12 from aktse/master

implemented some uml classes