hi
Merge branch 'master' of github.com:jinquan10/Test

Conflicts:
	hi.txt
hi