merge
Merge branch 'master' of https://github.com/zbigus/ksiegarnia.net
Merge branch 'master' of https://github.com/zbigus/ksiegarnia.net