add the readme file
added two tmpfiles
removed the two useless files
added the edit_merge file and modified in master branch
edited the file edit_merge in editfile branch
mv name test
del the tmp file
modified the edit_merge file
fix the branch
Merge branch 'editfile'
modified the same line in editfile branch with master branch
modified the same line in master branch with editfile branch
fix the confilet