Merge branch 'Krzysztof' of https://github.com/PCPR/przemoc.git