Final NTZ Commit
Merge branch 'master' of https://github.com/noamtz/AmgClustering

Conflicts:
	src/com/ntz/algorithms/Clustering.java