add README.html in .gitignore
add branch and branching model(workflow) sections in README
add merge section in README.rst
add rebase section in README.rst
add the missing 'handle conflict' in merge section
correct some inaccurate descriptions or grammer errors
add empty lines to separate links into groups
Merge branch 'release-0.1' into develop
Merge branch 'develop' of github.com:gpanda/gitest into develop