Merge branch 'master' of
https://github.com/xefiry/projet-l3-defesefa.git

Conflicts:
	projet-l3-defesefa/src/Main.java
Merge branch 'master' of
https://github.com/xefiry/projet-l3-defesefa.git
Merge branch 'master' of https://github.com/xefiry/projet-l3-defesefa.git
Essai d'interface pour la classe joueur.