m
Merge branch 'master' of https://github.com/troyhua/hw5-team10.git

Conflicts:
	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