add coding: utf-8
Merge branch 'dev' of github.com:lkhoho/learngit into dev

merge sombbody's work