second commit
Merge branch 'zadanie1_eksperyment'

Conflicts:
	zadanie1.txt