added types
Merge branch 'ankurgan-best-0.429'

Conflicts:
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Answer.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Answer_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/CandidateAnswer.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/CandidateAnswer_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/CandidateSentence.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/CandidateSentence_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Dependency.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Dependency_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/NER.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/NER_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/NounPhrase.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/NounPhrase_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Question.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/QuestionAnswerSet.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/QuestionAnswerSet_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Question_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Sentence.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Sentence_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/SourceDocument.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/SourceDocument_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Synonym.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Synonym_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/TestDocument.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/TestDocument_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Token.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/Token_Type.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/VerbPhrase.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/VerbPhrase_Type.java
Merge branch 'master' of https://github.com/ankurgandhe/hw5-team06.git
pulled from master
Merge branch 'ankurgan-best-0.429'
Merge branch 'master' into ankur-best-0.429+master
added lot of things
added lots of files
merged kohlibio2
added my questionCategory revisions
Modify voting method for "None of the above" answers.
added handling None of the above in Voting
added none of the above for voting
Added None of the above handling in voting function
Added output.xml generation code
added  data/QAMRE4 xml to gitignore
modified gitignore