Minor
Minor
conflict fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/tables/Customer.java