nowy plik
Merge branch 'master' into z3