good to go
Merge branch 'master' of https://github.com/lichris/themandarin-lms-dev