drugi commit
Merge branch 'maciek'