dirtyTree
console
forcedTOSwitch
resetStuff
prunning
BioData
rem largedata Files
ignrededModels psuedochangeWdnetAPI
successfulIgnore
hypernyms
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
Merge branch 'skohliBio2'

Conflicts:
	qa4mre-alzheimer-task/.gitignore
	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
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/utils/DistributionalSimilarity.java
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/utils/SetUtil.java
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/utils/WordNetAPI.java
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml