commit
Merge branch 'master' of https://github.com/antcamgar/IACO_CVRP

Conflicts:
	colony.py