Added some dependencies
Merge branch 'master' into Amos/UMLS-normalization
Merge branch 'Yulong/NLPProc'

B

ss
Add the NLPROC
Merge branch 'master' into Amos/UMLS-normalization

Conflicts:
	project-team02/pom.xml
fixed read question bug in preprocess
Merge branch 'Yulong/NLPProc'
Added UmlsToken that adds a field for the UMLS Term
Merge branch 'master' into Amos/UMLS-normalization

Conflicts:
	project-team02/src/main/java/team2/NLPProc.java
Merge branch 'Amos/UMLS-normalization'
Progress #5 Changed Lookup to use QuestionAnswer type, tweaked QuestionAnswer type, fixed error regarding TOP instead of Annotation
Branch Merged: Amos + My changes
Minor Automerge Mistakes fixed
Merge branch: Merged QuestionAnswer changs with Medical Term Normalization
Minor bug fixes
Fixed PoS Filtering
Merge branch: Progress #5 Fixed PoS Filtering
multiple cases
Merge branch 'spalakod/multiple_cases'
Fixes #5 first baseline version of retrieval
Merge branch First version of Lookup
Added MySQL driver dependency