diff --git a/case_0.png b/case_0.png
new file mode 100644
index 0000000..43d2628
Binary files /dev/null and b/case_0.png differ
diff --git a/case_1.png b/case_1.png
new file mode 100644
index 0000000..ebb7475
Binary files /dev/null and b/case_1.png differ
diff --git a/case_2.png b/case_2.png
new file mode 100644
index 0000000..ed29af6
Binary files /dev/null and b/case_2.png differ
diff --git a/case_3.png b/case_3.png
new file mode 100644
index 0000000..aaabc73
Binary files /dev/null and b/case_3.png differ
diff --git a/case_4.png b/case_4.png
new file mode 100644
index 0000000..3907567
Binary files /dev/null and b/case_4.png differ
diff --git a/case_5.png b/case_5.png
new file mode 100644
index 0000000..423b1e4
Binary files /dev/null and b/case_5.png differ
diff --git a/case_6.png b/case_6.png
new file mode 100644
index 0000000..6980115
Binary files /dev/null and b/case_6.png differ
diff --git a/case_7.png b/case_7.png
new file mode 100644
index 0000000..41c61dc
Binary files /dev/null and b/case_7.png differ
diff --git a/case_8.png b/case_8.png
new file mode 100644
index 0000000..5d8c5e4
Binary files /dev/null and b/case_8.png differ
diff --git a/case_9.png b/case_9.png
new file mode 100644
index 0000000..4de775e
Binary files /dev/null and b/case_9.png differ
diff --git a/demineur.html b/demineur.html
index de68c9e..e846418 100644
--- a/demineur.html
+++ b/demineur.html
@@ -34,10 +34,7 @@
       <button id="debut_game" onclick="chrono()">GO!</button>
       <button id="fin_game" onclick="reset()">CIAO</button>
 
-      <div id="grille">
-	<script type="text/javascript">grilleButtons(7,7);</script>
-
-      </div>
+      
     </div>
 
 
diff --git a/demineur.js b/demineur.js
index 89b184f..dae1c66 100644
--- a/demineur.js
+++ b/demineur.js
@@ -1,4 +1,4 @@
-class Case {
+class Case_grille {
     constructor(x, y) {
 	this.posX = x;
 	this.posy = y;
@@ -8,8 +8,52 @@ class Case {
     }
 
 }
-<<<<<<< HEAD
-=======
+
+
+
+let grille = [];
+let hauteur = 7;
+let largeur = 7;
+let number_mines = 10 ;
+
+
+
+
+
+function creerGrille(haut, larg,mine_nb) {
+    
+    grille.length = haut;
+    for (var i=0;i<haut;i++) {
+	grille[i] = Array(larg);
+	for (var j=0;j<larg;j++){
+	    grille[i][j] = 0;
+	}
+    }
+    
+
+    for (var k=0;k<mine_nb;k++) {
+	
+	let new_x = Math.floor(Math.random() * larg) ;
+	let new_y = Math.floor(Math.random() * haut) ;
+	
+	while (grille[new_y][new_x] == 9) {
+	    let new_x = Math.floor(Math.random() * larg) ;
+	    let new_y = Math.floor(Math.random() * haut) ;
+	}
+	
+	grille[new_y][new_x] = 9 ;
+	for (var m=Math.max(0,new_y-1);m<Math.min(haut,new_y+2);m++) {
+	    for (var n=Math.max(0,new_x-1);n<Math.min(larg,new_x+2);n++){
+		if (grille[m][n] != 9) {
+		    grille[m][n]++;
+		}
+	    }
+	} 
+	
+    }
+}
+
+
 //Fonction pour créer un cookie.
 function setCookie(name, value, days) {
     const expires = new Date(Date.now() + days * 864e5).toUTCString();
@@ -19,7 +63,7 @@ function setCookie(name, value, days) {
 function getCookie(name) {
     return document.cookie.split('; ').find(row => row.startsWith(name + '='))?.split('=')[1];
 }
->>>>>>> d322df708ea3bd0301a054980adc49db1c96d181
+
 
 function sleep(ms){
 	return new Promise(resolve => setTimeout(resolve, ms));
@@ -55,20 +99,6 @@ function Cookies() {
 //Cookies();
 
 
-let grille = [];
-let hauteur = 7;
-let largeur = 7;
-
-function creerGrille(haut, larg) {
-    grille.length = haut;
-    for (var i=0;i<haut;i++) {
-	grille[i] = Array(larg);
-	for (var j=0;j<larg;j++){
-	    grille[i][j] = new Case(j, i);
-	}
-    }
-    
-}
 
 
 
@@ -90,22 +120,23 @@ function cookie(){
 	
 }
 
+
 const cookieAccepted = getCookie('cookiesAccepted');
 
 if (!cookieAccepted){
 	cookie();
 }
 
-
 function selectImage(idCase) {
     const coords = idCase.split("_") ;
     const x = parseInt(coords[0]) ;
-    const y = parseInt(coords[0]) ;
+    const y = parseInt(coords[1]) ;
+    return("url('case_" + grille[x][y].toString() + ".png')'") ;
 }
 
 function changeImage(mouseEvent) {
     if (!(mouseEvent.target.classList.contains("buttonFlagged"))) {
-	mouseEvent.target.style.background="url('case_mine.png')" ;
+	mouseEvent.target.style.background= selectImage(this.id) ;
 	mouseEvent.target.classList.add("buttonRevealed") ;
     }
 }
@@ -126,11 +157,23 @@ function changeImageFlag(rightClick) {
 }
 
 function grilleButtons(haut, larg) {
-    const divGrille = document.getElementById("grille") ;
+    
+    const divJeu = document.getElementById("jeu") ;
+    var divGrille = document.createElement("DIV") ;
+    divGrille.id = "grille";
+    divGrille.style.display = "grid";
+    let taille = "50px " ;
+    let taille_cols = taille.repeat(larg) ;
+    let taille_rows = taille.repeat(haut) ;
+    divGrille.style.gridTemplateColumns = taille_cols ;
+    divGrille.style.gridTemplateRows = taille_rows ;
+    divJeu.appendChild(divGrille) ;
+
     for (var i=0;i<haut;i++) {
 	for (var j=0;j<larg;j++){
 	    var newCase = document.createElement("BUTTON") ;
-	    newCase.style.gridrow=i.toString() ;
+	    newCase.style.gridRow=i.toString() ;
+	    newCase.style.gridColumn = j.toString() ;
 	    newCase.classList.add("button_case") ;
 	    newCase.id = i.toString() + "_" + j.toString() ;
 	    newCase.style.background="url('case_vide.png')" ;
@@ -142,3 +185,5 @@ function grilleButtons(haut, larg) {
     }    
     
 }
+
+grilleButtons(7,7) ;
diff --git a/style.css b/style.css
index b64d1d2..a2e0f47 100644
--- a/style.css
+++ b/style.css
@@ -27,18 +27,19 @@
 
 }
 
-#grille{
-    display : grid;
-    grid-template-columns : 50px 50px 50px 50px 50px 50px 50px;
-    grid-template-rows : 50px 50px 50px 50px 50px 50px 50px;
+.button_case{
+    width : 50px;
+    height : 50px;
+    border : 0px;
+
 }
 
+
 .item_nav{
 	margin-top: 3px;
 	padding-right: 10px;
 }
 
-<<<<<<< HEAD
 .popup {
     position: fixed;
     top: 0;
@@ -89,10 +90,4 @@
 
 #close-popup:hover {
     background-color: #0056b3;
-=======
-.button_case{
-    width : 50px;
-    height : 50px;
-    border : 0px;
->>>>>>> 2a2cf84cf311b49f5c290c8502b43f35efa7ec30
 }