sdas
resolve conflict with Konrad
Merge branch 'master' of https://github.com/szmitas/szkolenie
Merge branch 'master' of https://github.com/szmitas/szkolenie