Fix things
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	src/CustomerTypes/Customer.java
	src/CustomerTypes/Elder.java
	src/CustomerTypes/Mother.java
	src/CustomerTypes/Student.java
	src/CustomerTypes/Worker.java
	src/supermarket/Customer.java
	src/supermarket/CustomerTypes/Customer.java
	src/supermarket/Truck.java