change from git_text
Merge branch 'git_text'

Conflicts:
	README.md