# WARNING: head commit changed in the meantime

Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/src/main/resources/analysis_engine/aeDescriptor.xml
-duplicated annotators that need to be run a second time for Supporting
Evidence Retrieval