Merge branch 'master' of https://github.com/tianyeblack/MultiAgtGeomExplorSys

Conflicts:

multiagentgeometryexploringsystem/MultiAgentGeometryExploringSystem.java
conflicts resolved