~
Merge branch 'master' of
ssh://git@github.com/minusone13/InvoicingSystem.git

Conflicts:
	AlertBillPO.txt
	CashPaymentPO.txt
	GiftBillPO.txt
	LevelStrategyPO.txt
	PaymentPO.txt
	PurBackSheetPO.txt
	PurSheetPO.txt
	ReachStrategyPO.txt
	ReceiptPO.txt
	SaleBackSheetPO.txt
	SaleSheetPO.txt
	SpillsLossBillPO.txt
	Stock.ser
	User.ser
	accountBuild/commodity/2014-12-15.ser
	accountBuild/customerInfo/2014-12-15.ser