moest umit want systeem is anders
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/supermarket/Customer.java
	src/supermarket/StaffTypes/Stocker.java
	src/supermarket/Supermarket.java