...
Merge branch 'master' of https://github.com/Wummer/ML1

Conflicts:
	KNN.pyc
	main.py