Halo
Hej
Merge branch 'foo'

Conflicts:
	plik.txt
lab4
lab4
Merge branch 'master' of https://github.com/chkamila/Kamila