wrote a readme file
add distributed
append GPL
git tracks changes
git tracks changes
branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
delete add merge
fix bug 101
merged bug fix 101
Merge branch 'master' of github.com:1989chenguo/git_test