recuperation
recuperation jp
relou
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/jeu/IHMAnswer.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/jeu/IHMAnswer.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Résolution problème vox