Some changes 3
Merge branch 'master' of https://github.com/Ico91/CoffeeMachine

Conflicts:
	bin/coffeeMachine/main/Main.class
	src/coffeeMachine/main/Main.java