test
Merge branch 'master' of https://github.com/nhat-quangdao/BillTest

Conflicts:
	bin/billTest/BillTest.class
	src/billTest/BillTest.java