layout
Merge branch 'psuminski'

Conflicts:
	app/assets/stylesheets/custom.css.erb
layout
poprawki
layout
Merge branch 'psuminski'
robie robie
Merge branch 'master' of https://github.com/zarie/apka
naprawa