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

Conflicts:
	src/supermarket/Person.java