removed merge conflicts

src/ihm/Main.java

@@ -23,10 +23,11 @@ public class Main extends Application {
 		primaryStage.setTitle("Shadow Hunters");
 		primaryStage.setScene(new Scene(root));
 		primaryStage.centerOnScreen();
+		primaryStage.setMaximized(true);
 		primaryStage.show();
 	}
 
 	public static void main(String[] args) {
 		launch(args);
 	}
-}
+}