update-readme branch 2
conflict 解消
Merge pull request #2 from morld/update-readme2

git fetch origin
git checkout master
git pull origin master
git checkout update-readme2 
git merge master
git push origin update-readme2