poprawka
Merge branch 'psuminski'
poprawione kontrolery
Merge branch 'psuminski'

Conflicts:
	app/controllers/restaurants_controller.rb
woah
Merge branch 'master' of github.com:zarie/apka

Conflicts:
	app/controllers/events_controller.rb
	app/controllers/restaurants_controller.rb
Merge branch 'master' of github.com:zarie/apka
woah
loosss
Import restauracji + poprawki w show dla nich.
Merge branch 'master' into pablo