Merge remote-tracking branch 'origin/Gwendal' into Thibaut

app/src/main/java/org/App.java

@@ -6,25 +6,25 @@ package org;
 import org.Controllers.IO;
 import org.Models.Grille;
 import org.Models.Jeu;
-import org.Views.VueGrille;
+import org.Views.VueTetris;
 
 public class App {
+
     public String getGreeting() {
         return "Hello World!";
     }
 
     public static void main(String[] args) {
-        System.out.println(new App().getGreeting());
 
         // Models
         Grille grille = new Grille(20, 10);
         Jeu jeu = new Jeu(grille);
-        
+
         // Views
-        VueGrille vueGrille = new VueGrille(grille, jeu);
+        VueTetris vueTetris = new VueTetris(grille, jeu);
 
         // Controllers
         IO io = new IO(jeu);
-        vueGrille.addKeyListener(io);
+        vueTetris.addKeyListener(io);
     }
 }