add new file
delete file
Merge https://github.com/watchsky/test-git
add another new file