Binary files differ
Merge branch 'master' of https://github.com/JoepS/GeneralStore

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