fixing merge conflict
Merge branch 'master' of https://github.com/ccravens/ml.git

Conflicts:
	knn/__init__.py