test reset soft
delete test
Merge branch 'master' of github.com:smiletiger/test