Create depathment  with employee
binary
Merge branch 'Matthijs'

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/build/classes/generalstore/Warehouse.class
	Java Project/GeneralStore/src/generalstore/GeneralStore.java
Merge branch 'Matthijs'

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/build/classes/generalstore/Warehouse.class
	Java Project/GeneralStore/src/generalstore/GeneralStore.java