PartOfShop is now ObjectInShop :kissing:
Sync with errors

Conflicts:
	src/supermarket/StaffTypes/Cashier.java
	src/supermarket/StaffTypes/Staff.java
	src/supermarket/StaffTypes/Unloader.java
	src/supermarket/Supermarket.java
	src/supermarket/Truck.java