Merge remote-tracking branch 'origin/master'
增加中文到hi.txt