panel admina
panel admina
Merge branch 'psuminski'

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
testyyyy
28-07
gemlock II
gemlock II
Merge branch 'volix' of github.com:zarie/apka into volix
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
Merge branch 'master' of github.com:zarie/apka
asdasdas