working on cashregister
plus other shit
working on cashregister
plus other shit
Cashregister fixed
binary
Merge remote-tracking branch 'origin/master' into Matthijs

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