Merge branch 'dev' of github.com:capfull/learngit into dev

shz test for dev