branch test
and simple
&simple
conflict fixed
add file
delete myclone
Merge branch 'master' of github.com:Yuyingfeng/Git_Yuyingfeng