aaaaaaaa
Merge branch 'master' of https://github.com/javiersan18/easyMahout

Conflicts:
	prueba.log
	src/easyMahout/GUI/clustering/AlgorithmClusterPanel.java
	src/easyMahout/GUI/clustering/DistanceMeasurePanel.java
	src/easyMahout/utils/Constants.java
limpio