my first commit
Merge remote-tracking branch 'origin/zbigniew'

Conflicts:
	alice.txt