Poging tot command pattern (not)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/infswa02/GUI/KoffieMachineGUI.java