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

Conflicts:
	.classpath
Merge branch 'master' of git@github.com:minusone13/InvoicingSystem.git