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

Conflicts:
	project-team05/pom.xml
Merge branch 'master' of https://github.com/11791-5/project-team5.git
Merge conflicts
Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/oaqa/annotators/SnippetAnnotator.java