this is a learning of git first step
Merge branch 'master' of http://github.com/qianyang1940/Git_test
test