AntColony renamed to ACO
Merge branch 'master' of git@github.com:Sterbic/OPTJAVA.git