committing my version
modified type system
Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/SnippetSearchResult.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/SnippetSearchResult_Type.java