run了一遍JUnit 解决user文件冲突
Merge branch 'master' of
https://github.com/minusone13/InvoicingSystem.git

Conflicts:
	AlertBillPO.txt
	GiftBillPO.txt
	SpillsLossBillPO.txt
	User.ser