/.settings/ /target/ /bin/ /.idea/ /.project <<<<<<< HEAD /.classpath ======= /jeu-de-combat.iml /pom.xml >>>>>>> branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git