binary
Merge remote-tracking branch 'origin/master' into Joep

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/CashRegister.class
	Java Project/GeneralStore/build/classes/generalstore/Pathway.class
	Java Project/GeneralStore/build/classes/generalstore/Warehouse.class
Binary
somethinng
Merge remote-tracking branch 'origin/master' into Joep

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/Customer.class
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class
	Java Project/GeneralStore/build/classes/generalstore/Pathway.class
	Java Project/GeneralStore/src/generalstore/Customer.java
	Java Project/GeneralStore/src/generalstore/GeneralStore.java
	Java Project/GeneralStore/src/generalstore/Pathway.java
patway locations
Merge remote-tracking branch 'origin/master' into Joep

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/CashRegister.class
	Java Project/GeneralStore/build/classes/generalstore/Customer.class
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class
	Java Project/GeneralStore/src/generalstore/Customer.java
lost of stufs
Merge branch 'Joep'

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/Customer.class
	Java Project/GeneralStore/src/generalstore/Customer.java