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

Conflicts:
	controllers/DishesController.js
	public/viewmodels/dishesListViewModel.js
	views/Dishes/List.ejs
menu