save before move to mac
Merge branch 'master' of https://github.com/jinxiaosa/CiscreaRegulation