dodawanie restauracji
Merge branch 'psuminski'

Conflicts:
	app/views/restaurants/show.html.haml
	config/routes.rb
Merge branch 'master' of github.com:zarie/apka into asiabaj
Edycja widoku #new dla dish.
Merge branch 'asiabaj' of github.com:zarie/apka into asiabaj

Conflicts:
	app/views/dishes/new.html.haml