28-07
Merge branch 'master' of github.com:zarie/apka

Conflicts:
	app/controllers/dishes_controller.rb
	app/controllers/restaurants_controller.rb
	db/seeds.rb
Merge branch 'master' of github.com:zarie/apka
Merge branch 'master' of github.com:zarie/apka
asdasdas