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

Conflicts:
	CoffeeMachine/CoffeeMachine.xcodeproj/project.pbxproj

CoffeeMachine/CoffeeMachine.xcodeproj/project.xcworkspace/xcuserdata/dan
cho.xcuserdatad/UserInterfaceState.xcuserstate

CoffeeMachine/CoffeeMachine.xcodeproj/xcuserdata/dancho.xcuserdatad/xcde
bugger/Breakpoints.xcbkptlist