up
Merge branch 'master' of https://github.com/AndreyNikolaev/CoffeeMachineIOS-2nd-edition

Conflicts:
	.DS_Store

CoffeeMachine.xcodeproj/project.xcworkspace/xcuserdata/dancho.xcuserdata
d/UserInterfaceState.xcuserstate