comm
aa
inital setup
structure changed
SynonymExpanderAdded
Fixed
before merge
uploading
Test
WordNet Syn add to phraseAnnoator, created a cache
Adverb
fin
added verbPhrase, synin Noun Annotator, cache
Merge remote-tracking branch 'origin/master' into skohli

Conflicts:
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/utils/WordNetAPI.java
conflict resolution
changed aggregate to voting
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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/answer_ranking/AnswerChoiceCandAnsSimilarityScorer.java
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_1.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_2.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_3.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
gitignore model
Merge branch 'mario'

Conflicts:
	qa4mre-alzheimer-task/.gitignore
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_1.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_2.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_3.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi