stash test
confilicts
add meFile
home file update
Merge branch 'newDev' of github.com:dudongdaoqi/gitTest into newDev

yes i have to
modify me file
Merge branch 'newDev' of github.com:dudongdaoqi/gitTest into newDev
test more peple work