Merge branch 'master' into robocza
Merge branch 'robocza' of https://github.com/czornexxx/Projekt into robocza