voor de liefste moreno
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	src/supermarket/Customer.java
Merge branch 'master' of https://github.com/jelmerhulsman/Supermarket