Commit to merge
Merge branch 'clusterAlgorithms' of https://github.com/shilad/context-sensitive-sr into clusterAlgorithms

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