Poprawki zlego merge'a
Merge branch 'master' of https://github.com/quetz05/KeyLogger