restauracje bez jsa
Merge branch 'psuminski'

Conflicts:
	config/routes.rb
Merge branch 'master' of https://github.com/zarie/apka
poprawka w filtrowaniu restauracji
heroku fix
Merge branch 'psuminski'
For the lulz.
Merge branch 'master' into pablo
Paymenty naleza do eventow.
aha
view
redirectpoodejsciu
Merge branch 'master' of https://github.com/zarie/apka