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

Conflicts:
	.DS_Store
delete