remise de la partie ihm

src/ihm/controller/MenuController.java

@@ -8,11 +8,19 @@ public class MenuController {
 	@FXML
     private Label label;
 
+<<<<<<< HEAD
     public void commencerPartie(MouseEvent mouseEvent) {
         System.out.println("Bonjouuuuur!");
     }
     
     public void afficherRegle(MouseEvent mouseEvent) {
+=======
+    public void afficheBonjour(MouseEvent mouseEvent) {
+        System.out.println("Bonjouuuuur!");
+    }
+    
+    public void changerNom(MouseEvent mouseEvent) {
+>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
     	System.out.println("clik");
     }
 }