Merge pull request #3 from hys/release

1.1
Merge branch 'master' of github.com:hys/git-practice
Merge pull request #4 from hys/release

1.2
Merge pull request #5 from hys/release

1.3
1.3.1
resolve conflict
Merge branch 'master' into release
1.4