Initial commit
add my information
Merge branch 'master' of github.com:huiyuejiao/hello_world

simple merge test