sh
Merge branch 'master' of github.com:jaweyhuang/gittest

Conflicts:
	read.txt