storagestest/customertest update
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/supermarket/CustomerTest.java
	test/supermarket/StorageTest.java