Konflikt
Merge pull request #22 from otka/Nowa

Konflikt
nowy