resolve conflict
Merge branch 'master' of https://github.com/hqt/MathHub
resolve
Merge branch 'master' of https://github.com/hqt/MathHub
add discussion dal