up
Merge branch 'master' of https://github.com/GracielaM/CoffeeMachineStoryboard

Conflicts:
	CoffeeMachineStoryboard/Main.storyboard