add file.txt
update file.txt
add file.txt
delete file.txt
 add file.txt
Merge branch 'master' of github.com:justanding/learngit