added screen resolution
Merge remote-tracking branch 'origin/master' into Joep
Merge remote-tracking branch 'origin/master' into Joep
binary
First display of amount of customers and customers has own thread
Merge branch 'Joep'

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/Customer.class
	Java Project/GeneralStore/build/classes/generalstore/Department.class
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class
	Java Project/GeneralStore/src/generalstore/Display.java
	Java Project/GeneralStore/src/generalstore/GeneralStore.java
binary files and stufs
Merge branch 'master' of https://github.com/JoepS/GeneralStore

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class