drugie podejscie do skonfliktowania
Merge branch 'master' of https://github.com/murbans1/testgit

Conflicts:
	README.md