tescikitesciki
Merge branch 'master' into mikolaj
Import wszystkich knajp z danego miasta.
Merge branch 'master' into pablo

Conflicts:
	app/models/restaurant.rb
Ojtam ojtam nie znam ruby'ego
testyyy4
Merge branch 'master' of https://github.com/zarie/apka
test