Conflicts:
	include/env_map.h
	include/simulator.h
	src/agent.cpp
	src/env_map.cpp
	src/moving_obstacle.cpp
	src/simulator.cpp
	src/viewer.cpp

Conflicts:
	include/agent.h
	include/env_generator.h
	include/env_generator.hpp
	include/env_map.h
	include/env_render.h
	include/exportObstacles.h
	include/exportObstacles.hpp
	include/obstacle.h
	include/path_finder.h
	include/path_finder.hpp
	include/simulator.h
	include/viewer.h
	src/agent.cpp
	src/env_map.cpp
	src/simulator.cpp
	src/viewer.cpp

- Simplification des faces optimisées (en deux passse pour éviter le O(n^2) et les faces oubliées)
- Ajout de paramètres au programme : la taille minimal des cellules, le nombre d'itérarions avant l'arrêt de la simulation

Conflicts:
	CMakeLists.txt
	include/env_generator.h
	include/env_generator.hpp
	include/env_map.h
	src/simulator.cpp

Conflicts:
	CMakeLists.txt
	graphData/graphBenchMemoryCircles1000.svg
	src/env_map.cpp
	src/simulator.cpp