zmiana 3 linii
Merge branch 'master' of https://github.com/pjakwert/testrepo

Conflicts:
	newfile.txt