I also add some text into README.txt
Merge branch 'master' of https://github.com/humingchun/try_git

Conflicts:
	README.txt