Merge pull request #4 from kebabkiller/master

merge
cała projekt
Merge pull request #6 from miki9938/master

qwe