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

Conflicts:
	project-team05/evaluation.txt
	project-team05/project.properties
	project-team05/snippetResults.txt
	project-team05/src/main/java/edu/cmu/lti/oaqa/annotators/AnswerAnnotator.java
	project-team05/src/main/java/util/FullDocumentSources.java
Enriching answer variants