Modified K-means algorithm, add a cluster variable.
Merge branch 'master', remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs