text 1
Merge branch 'master' of https://github.com/funivan/tr into edit

Conflicts:
	README.md