added question type to raw data
new types for annotation questions
removed debug stmts from training data annotator
Merge branch 'master' of https://github.com/hunterhector/hw5-team03
updated classpaths, hopefully this doesn't break anything..