add coding: utf8
Merge branch 'dev' of github.com:bugmelody/test into dev