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

Conflicts:
	CoffeeMachine/.DS_Store

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