zmiana z taska3
Commit z brancha3
master commit
Merge branch 'task3'

Conflicts:
	plik1.txt