.
Merge branch 'master' of https://github.com/scferrada/Euclidean-TSP

Conflicts:
	src/cc4102/app/CNRTest.java
	src/cc4102/app/Experiment.java
graphics images