Mise à niveau

Signed-off-by: Thomas Marques <marquesthom@gmail.com>
Merge branch 'master' of https://github.com/ThomasMarques/SMA

Conflicts:
	pathfinder.h
	planet.h
	robot.h
	strategie.cpp
merge

Signed-off-by: Thomas Marques <marquesthom@gmail.com>
strategie des robot opérationnelle + merge :

Merge branch 'master' of https://github.com/ThomasMarques/SMA

Conflicts:
	clan.cpp
	warrior.cpp
Merge branch 'master' of https://github.com/ThomasMarques/SMA