Commenting
Merge branch 'master' of https://github.com/loganperreault/SWARM

Conflicts:
	bin/aco/ACO.class
	bin/aco/Colony.class
	bin/clustering/ACOClustering.class
	bin/driver/Simulator.class
	src/driver/Simulator.java