cluster work progresses
Merge branch 'master' of github.com:carlemil/TSP-solver

Conflicts:
	src/TSPSolver.java