Correction de l'algo de combat
Merge branch 'master' of https://github.com/damien-cremilleux/SmallWorld

Conflicts:
	VisualStudio/ProjetPOO/Unite.cs