Merge branch 'master' of github.com:vicowong/git-test

Signed-off-by: vicowong <vicowong@21cn.com>