pulling
Merge branch 'master' of https://github.com/aj-michael/Mahout
added to classifier
fixed conflict