diff --git a/jeu.c b/jeu.c
index 713c616..afee0f2 100644
--- a/jeu.c
+++ b/jeu.c
@@ -6,6 +6,11 @@
 
 
 void GraphJeu(){
+	int x = 50, y = 50, xx = 150, yy = 50, i = 0;
 	printf("fichier jeu.c taille variable\n");
+	DessinerSegment(x, y, xx, yy);
+	for(i = 0; i < 9; i++){
+		DessinerSegment(x, y * i, xx * i, yy * i);
+	}
 	while(1){}
 }
diff --git a/pion.c b/pion.c
index e69de29..d7613f1 100644
--- a/pion.c
+++ b/pion.c
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+
+=======
+>>>>>>> f21a4c872d10db76a298caf1b13782029be1130e