commit to merge with Ben's changes
Merge remote-tracking branch 'upstream/clusterAlgorithms' into clusterAlgorithms

Conflicts:
	algorithms/src/org/macademia/algs/Kmeans.java
	algorithms/src/org/macademia/algs/TestPeople.java