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

Conflicts:
	User.ser