diff --git a/grille.c/grille.c b/grille.c/grille.c
deleted file mode 100644
index 967c6c6..0000000
--- a/grille.c/grille.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <graph.h>
-
-int* creer_grille(void){
-    int* Grille=NULL;
-    Grille=(int*) malloc(40*60*sizeof(int));
-    return Grille;
-}
-
-void creer_grille_graph(){
-    int x=200,y=200;
-    ChoisirCouleurDessin(CouleurParComposante(0,0,0));
-    DessinerRectangle(x,y,1200,1000)
-    DessinerRectangle(x,y,900,600);
-    for(x=200;x<1100;x=x+15){
-        DessinerSegment(x,y,x,800);
-    }
-    x=200;
-    y=200;
-    for(y=200;y<800;y=y+15){
-        DessinerSegment(x,y,1100,y);
-    }
-
-}
-
-int main(void){
-    char x;
-    InitialiserGraphique();
-    CreerFenetre(0,0,1300,1300);
-    creer_grille_graph();
-    while(x != 'q'){
-        scanf("%c",&x);
-    }
-}
\ No newline at end of file
diff --git a/src/grille.c b/src/grille.c
index 802d072..5905e87 100644
--- a/src/grille.c
+++ b/src/grille.c
@@ -9,6 +9,17 @@ int* creer_grille(void){
 }
 
 void creer_grille_graph(){
+<<<<<<< HEAD
+    int x_grille=0,y_grille=0,x,y;
+    ChoisirCouleurDessin(CouleurParComposante(0,0,0));
+    DessinerRectangle(x_grille,y_grille,1200,1000);
+    DessinerRectangle(x_grille,y_grille,900,600);
+    for(x=x_grille;x<1100;x=x+15){
+        DessinerSegment(x,y_grille,x,800);
+    }
+    for(y=y_grille;y<800;y=y+15){
+        DessinerSegment(x_grille,y,1100,y);
+=======
     int x=200,y=200;
     ChoisirCouleurDessin(CouleurParComposante(0,0,0));
     DessinerRectangle(x,y,1200,1000);
@@ -20,6 +31,7 @@ void creer_grille_graph(){
     y=200;
     for(y=200;y<800;y=y+15){
         DessinerSegment(x,y,1100,y);
+>>>>>>> 03cdfc71722afd1d8631e3ed432af6d031cd9b7e
     }
 
 }
diff --git a/src/snake.c b/src/snake.c
new file mode 100644
index 0000000..13c1539
--- /dev/null
+++ b/src/snake.c
@@ -0,0 +1,7 @@
+#include<stdio.h>
+#include<stdlib.h>
+#include<graph.h>
+
+void creer_snake(){
+    serpent[1]
+}
\ No newline at end of file
diff --git a/src/timer.c b/src/timer.c
new file mode 100644
index 0000000..73a921a
--- /dev/null
+++ b/src/timer.c
@@ -0,0 +1,28 @@
+#include<stdio.h>
+#include<stdlib.h>
+#include<graph.h>
+#define delta 1000000L
+
+void creer_timer(void){
+    int sec;
+    unsigned long temps;
+    temps=Microsecondes();
+    while(sec!=10){
+        temps=Microsecondes+delta;
+        printf("%d\n",sec);
+        sec=temps%11;
+    }
+}
+
+
+
+
+
+
+
+int main(void){
+    InitialiserGraphique();
+    CreerFenetre(0,0,1300,1300);
+    creer_timer();
+    FermerGraphique();
+}
\ No newline at end of file