Merge branch 'master' of github.com:11693-5/project-team5
Merge branch 'xiaohan'
Ningna Wang
Merge branch 'cyc' into annotator

Conflicts:
	project-team05/src/main/java/util/GoPubMedServiceExample.java
Merge remote-tracking branch 'origin/freddiez' into xiaohan
modify consumer
Merge branch 'xiaohan'
refactor
merge
merge
jdk version
Change CPEDescpritor
merge
merge
resolve conflict
annotator modified
+util
change from system output to file write
merge
Merge branch 'master' of https://github.com/11693-5/project-team05.git

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/f14/team05/BioConsumer.java