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