entropy
Merge branch 'master' of https://github.com/Austhyma/DataMining_Homework4

Conflicts:
	KMeansClustering.java~