tour-edges
Merge branch 'master' of https://github.com/isaacsanders/aco-tsp

Conflicts:
	src/aco_tsp/core.clj