re-submit
Merge branch 'master' of https://github.com/daimictse/smart-learning