lda
fix merge
Merge branch 'master' of https://github.com/comaple/KDD
Merge branch 'master' of https://github.com/comaple/KDD