add merge
bug fix after cotinue working
add coding utf-8
Merge branch 'dev' of github.com:GitLearnBling/learngit into dev