tests working again
Merge branch 'master' of github.com:mclumd/swarm-simulator