innit
Merge branch 'master' of github.com:barthimaeus/ML-kNearest

Conflicts:
	kNearest/Distance.java
	kNearest/KNearest.java
	kNearest/Naive.java