Merge branch 'master' of https://github.com/rgates4960/Mandarin-Flash
Merge branch 'master' of https://github.com/rgates4960/Mandarin-Flash