idk
fixed conflict
made untested knn classifier
Merge branch 'master' of https://github.com/aj-michael/Mahout