Commiting
Merge branch 'master' of https://github.com/Ico91/CoffeeMachine

Conflicts:
	src/coffeeMachine/main/Main.java
	src/coffeeMachine/main/MoneyAmount.java
Resolving main