refactoring
Merge branch 'master' of https://github.com/abditag2/Safe-Flocking