phase 1&2
Merge branch 'master' of https://github.com/msenar/ants