add text
Merge branch 'master' of https://github.com/kidGuo/HGDemo

Conflicts:
	hello.txt