komentarz
bills
Merge branch 'master' into kinga

Conflicts:
	app/controllers/dishes_contorller.rb
	app/models/dish.rb
	db/schema.rb
Merge branch 'master' of github.com:zarie/apka into kinga

Conflicts:
	db/schema.rb
to ja