one`s commit
some txt
Merge branch 'master' of github.com:theUm/dict

Conflicts:
	text.txt