Updated OrderFlow and PaymentFlow
Merge branch 'master' of https://github.com/Ico91/CoffeeMachine

Conflicts:
	src/coffeeMachine/main/Drink.java