Merge pull request #21 from teynard/benjamin_branch_restart

mise en place du system d attaque partielement
Merge branch 'master' into benjamin_branch_restart
mise a jours des cerlces etc