alice.txt changed
Merge remote-tracking branch 'origin/radek'

Conflicts:
	alice.txt