model and controller
Merge branch 'master' of github.com:poppinlp/NKU