track remote develop branch
pull remote branch as a new local branch
have fixed the conflict between master and local develop/remote_branch
Merge branch 'master' of https://github.com/wangyn99/gitUsing-test