Merge branch 'master' of https://github.com/ronrey/SmartCoffeeApp
Merge branch 'master' of https://github.com/ronrey/SmartCoffeeApp

Conflicts:
	.DS_Store
	smartcoffee/.DS_Store