#niewiemjaktotagowac
role
Merge branch 'psuminski'
gem binding_of_caller
Historia dlugow.
Merge branch 'master' into pablo

Conflicts:
	app/controllers/users_controller.rb
role, panel admina
Merge branch 'psuminski'

Conflicts:
	Gemfile.lock
	app/controllers/users_controller.rb
bleble
Merge branch 'master' into mikolaj
migracja
Merge branch 'psuminski'
menu
menu
tempy
tempy
Merge branch 'master' into mikolaj