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

Conflicts:
	src/coffeeMachine/main/PaymentFlow.java
Merging Payment flow