28-07
dodawanie restauracji
Merge branch 'psuminski'

Conflicts:
	app/views/restaurants/show.html.haml
	config/routes.rb
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
tempiki
Merge branch 'master' into mikolaj
Heroku :<
dodwanie restauracji
poprawki
Merge branch 'psuminski'
Merge branch 'master' of github.com:zarie/apka
asdasdas
ban zamaist banned
restauracje
ajax
Merge branch 'psuminski'

Conflicts:
	app/views/users/_user.haml
Merge branch 'master' of https://github.com/zarie/apka
eventy
Redirect po dodaniu dania w nieznanej restauracji.