c2
Merge branch 'master' of https://github.com/mmilosz/testowe

Conflicts:
	abc.txt