add file after reset
Merge branch 'master' of github.com:langzi0/testgit