new file:   testfromgit.txt
Merge branch 'master' of https://github.com/luzuoqing/Yat-Sen-Blog