asad
Merge branch 'master' of https://github.com/zarie/apka
aktywna/nieaktywna
Merge branch 'master' of https://github.com/zarie/apka
css
testy
one error less
Merge branch 'master' of https://github.com/zarie/apka
merge
testy
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
Dobre sortowanie nazw ze znakami diakrytycznymi.