edit2
Merge branch 'master' of github.com:vivijie/GitTutorial