LOCATION LOCATION LOCATION!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/supermarket/StaffTypes/Staff.java