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

testx