.
Merge branch 'master' of https://github.com/AndreyNikolaev/CoffeeMachineIOS

Conflicts:

CoffeeMachine/CoffeeMachine.xcodeproj/project.xcworkspace/xcuserdata/dan
cho.xcuserdatad/UserInterfaceState.xcuserstate
	CoffeeMachine/CoffeeMachine/Model/MoneyAmount.m
	CoffeeMachine/CoffeeMachine/ViewController.m