Dishes
Merge branch 'master' of github.com:MariMax/cafeShop

Conflicts:
	.gitignore
	app.js
	package.json
Dish.js
DishesController.js
dishes.js