//
Merge remote-tracking branch 'origin/master' into Matthijs
Merge remote-tracking branch 'origin/master' into Matthijs
Pain
Merge branch 'master' of https://github.com/JoepS/GeneralStore

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class
	Java Project/GeneralStore/src/generalstore/Display.java
Merge branch 'master' of https://github.com/JoepS/GeneralStore

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