created branch
added question and answer categories to type system
Created simple question category (when vs. how many vs. other)
set up SOLR on my machine;
created subj of wh-word feature;
refining question category annotator
working on determining what type of thing a which-question is asking
for;
refined noun phrase annotation, now requires an NN tag as part of the
noun, previously allowed bare cardinals and adjectives
type system JCasGen
updated phrase annotator nouns to match question phrase annotator nouns
updated PhraseAnnotator nouns to match QuestionPhraseAnnotator nouns
Merge branch 'mario'
Merge branch 'master' of https://github.com/ankurgandhe/hw5-team06.git

Conflicts:
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_1.xmi
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_2.xmi
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_3.xmi
Merge branch 'master' of https://github.com/ankurgandhe/hw5-team06.git