commit
Merge branch 'master' of github.com:myoortcloud/dotmagi_TEST_A