Name's different location
something
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java Project/GeneralStore/src/generalstore/DeliveryWagon.java
	Java Project/GeneralStore/src/generalstore/GeneralStore.java