New Framework

Durandal
Merge branch 'master' of https://github.com/rpwang/learnHSK

Conflicts:
dev/assets/js/HSKscript.js
dev/index.html
Merge branch 'master' of https://github.com/rpwang/learnHSK