Merge pull request #1 from janfasola6git/feat1

zmiany w feat1
zmiana w masterze

4
Merge pull request #2 from janfasola6git/master

pobieramy mastera