dla misia ;P
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascripts/cennik.js