snel comitten omdat lineaire algebra
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/supermarket/Storage.java