merge
Merge branch 'master' of https://github.com/nqdao/BillTest

Conflicts:
	bin/billTest/BillTest.class
updated test cases