small changes
Merge remote-tracking branch 'upstream/clusterAlgorithms' into clusterAlgorithms

Conflicts:
	algorithms/src/org/macademia/algs/People_Distance.java
maybe working