fix for issue #1 - Tyler Keeling
Merge branch 'master' of https://github.com/Xiaolong-Zou/labjenkinsQ

Conflicts:
	README.md
	build.xml