diff --git a/debug/grille.o b/debug/grille.o
index 1a1c07d0a677cd255955669549b5288612bcef3d..1f2e0a8a098f4fc071d1ffa09c885bfc9e333bc0 100644
Binary files a/debug/grille.o and b/debug/grille.o differ
diff --git a/debug/moc_grille.cpp b/debug/moc_grille.cpp
index a0d5e823b47792ca9adf48c446b908bd1664a4ab..a38a91cb929807bf337f05578ce371018e68be8a 100644
--- a/debug/moc_grille.cpp
+++ b/debug/moc_grille.cpp
@@ -24,7 +24,7 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_Grille_t {
     QByteArrayData data[23];
-    char stringdata0[239];
+    char stringdata0[243];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -40,31 +40,31 @@ QT_MOC_LITERAL(3, 19, 12), // "focusChanged"
 QT_MOC_LITERAL(4, 32, 12), // "verifClicked"
 QT_MOC_LITERAL(5, 45, 19), // "chiffreActifChanged"
 QT_MOC_LITERAL(6, 65, 11), // "gameIsSaved"
-QT_MOC_LITERAL(7, 77, 14), // "changer_valeur"
-QT_MOC_LITERAL(8, 92, 6), // "valeur"
-QT_MOC_LITERAL(9, 99, 5), // "Carre"
-QT_MOC_LITERAL(10, 105, 4), // "Case"
-QT_MOC_LITERAL(11, 110, 15), // "colorer_voisins"
-QT_MOC_LITERAL(12, 126, 5), // "focus"
-QT_MOC_LITERAL(13, 132, 13), // "verif_matrice"
-QT_MOC_LITERAL(14, 146, 17), // "set_chiffre_actif"
-QT_MOC_LITERAL(15, 164, 1), // "i"
-QT_MOC_LITERAL(16, 166, 9), // "save_grid"
-QT_MOC_LITERAL(17, 176, 6), // "values"
-QT_MOC_LITERAL(18, 183, 22), // "QList<QList<QString> >"
-QT_MOC_LITERAL(19, 206, 6), // "colors"
-QT_MOC_LITERAL(20, 213, 8), // "verifier"
-QT_MOC_LITERAL(21, 222, 10), // "coloration"
-QT_MOC_LITERAL(22, 233, 5) // "saved"
+QT_MOC_LITERAL(7, 77, 9), // "save_grid"
+QT_MOC_LITERAL(8, 87, 14), // "changer_valeur"
+QT_MOC_LITERAL(9, 102, 6), // "valeur"
+QT_MOC_LITERAL(10, 109, 5), // "Carre"
+QT_MOC_LITERAL(11, 115, 4), // "Case"
+QT_MOC_LITERAL(12, 120, 21), // "changer_valeur_bouton"
+QT_MOC_LITERAL(13, 142, 1), // "i"
+QT_MOC_LITERAL(14, 144, 15), // "colorer_voisins"
+QT_MOC_LITERAL(15, 160, 5), // "focus"
+QT_MOC_LITERAL(16, 166, 13), // "verif_matrice"
+QT_MOC_LITERAL(17, 180, 5), // "saved"
+QT_MOC_LITERAL(18, 186, 10), // "coloration"
+QT_MOC_LITERAL(19, 197, 6), // "values"
+QT_MOC_LITERAL(20, 204, 22), // "QList<QList<QString> >"
+QT_MOC_LITERAL(21, 227, 6), // "colors"
+QT_MOC_LITERAL(22, 234, 8) // "verifier"
 
     },
     "Grille\0valChanged\0\0focusChanged\0"
     "verifClicked\0chiffreActifChanged\0"
-    "gameIsSaved\0changer_valeur\0valeur\0"
-    "Carre\0Case\0colorer_voisins\0focus\0"
-    "verif_matrice\0set_chiffre_actif\0i\0"
-    "save_grid\0values\0QList<QList<QString> >\0"
-    "colors\0verifier\0coloration\0saved"
+    "gameIsSaved\0save_grid\0changer_valeur\0"
+    "valeur\0Carre\0Case\0changer_valeur_bouton\0"
+    "i\0colorer_voisins\0focus\0verif_matrice\0"
+    "saved\0coloration\0values\0QList<QList<QString> >\0"
+    "colors\0verifier"
 };
 #undef QT_MOC_LITERAL
 
@@ -89,10 +89,10 @@ static const uint qt_meta_data_Grille[] = {
        6,    0,   68,    2, 0x06 /* Public */,
 
  // methods: name, argc, parameters, tag, flags
-       7,    3,   69,    2, 0x02 /* Public */,
-      11,    3,   76,    2, 0x02 /* Public */,
-      13,    0,   83,    2, 0x02 /* Public */,
-      14,    1,   84,    2, 0x02 /* Public */,
+       7,    0,   69,    2, 0x02 /* Public */,
+       8,    3,   70,    2, 0x02 /* Public */,
+      12,    1,   77,    2, 0x02 /* Public */,
+      14,    3,   80,    2, 0x02 /* Public */,
       16,    0,   87,    2, 0x02 /* Public */,
 
  // signals: parameters
@@ -103,25 +103,25 @@ static const uint qt_meta_data_Grille[] = {
     QMetaType::Void,
 
  // methods: parameters
-    QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int,    8,    9,   10,
-    QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Bool,    9,   10,   12,
     QMetaType::Void,
-    QMetaType::Void, QMetaType::Int,   15,
+    QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int,    9,   10,   11,
+    QMetaType::Void, QMetaType::Int,   13,
+    QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Bool,   10,   11,   15,
     QMetaType::Void,
 
  // properties: name, type, flags
-      17, 0x80000000 | 18, 0x0049500b,
-      19, 0x80000000 | 18, 0x0049500b,
-      20, QMetaType::Int, 0x00495003,
-      21, QMetaType::Int, 0x00495003,
-      22, QMetaType::Bool, 0x00495003,
+      17, QMetaType::Bool, 0x00495003,
+      18, QMetaType::Int, 0x00495003,
+      19, 0x80000000 | 20, 0x0049500b,
+      21, 0x80000000 | 20, 0x0049500b,
+      22, QMetaType::Int, 0x00495003,
 
  // properties: notify_signal_id
+       4,
+       3,
        0,
        1,
        2,
-       3,
-       4,
 
        0        // eod
 };
@@ -137,11 +137,11 @@ void Grille::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void
         case 2: _t->verifClicked(); break;
         case 3: _t->chiffreActifChanged(); break;
         case 4: _t->gameIsSaved(); break;
-        case 5: _t->changer_valeur((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3]))); break;
-        case 6: _t->colorer_voisins((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< bool(*)>(_a[3]))); break;
-        case 7: _t->verif_matrice(); break;
-        case 8: _t->set_chiffre_actif((*reinterpret_cast< int(*)>(_a[1]))); break;
-        case 9: _t->save_grid(); break;
+        case 5: _t->save_grid(); break;
+        case 6: _t->changer_valeur((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3]))); break;
+        case 7: _t->changer_valeur_bouton((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 8: _t->colorer_voisins((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< bool(*)>(_a[3]))); break;
+        case 9: _t->verif_matrice(); break;
         default: ;
         }
     } else if (_c == QMetaObject::IndexOfMethod) {
@@ -184,8 +184,8 @@ void Grille::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void
     } else if (_c == QMetaObject::RegisterPropertyMetaType) {
         switch (_id) {
         default: *reinterpret_cast<int*>(_a[0]) = -1; break;
-        case 1:
-        case 0:
+        case 3:
+        case 2:
             *reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< QList<QList<QString> > >(); break;
         }
     }
@@ -196,11 +196,11 @@ void Grille::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void
         Q_UNUSED(_t)
         void *_v = _a[0];
         switch (_id) {
-        case 0: *reinterpret_cast< QList<QList<QString> >*>(_v) = _t->valeurs; break;
-        case 1: *reinterpret_cast< QList<QList<QString> >*>(_v) = _t->colors; break;
-        case 2: *reinterpret_cast< int*>(_v) = _t->verif; break;
-        case 3: *reinterpret_cast< int*>(_v) = _t->chiffre_IsActif; break;
-        case 4: *reinterpret_cast< bool*>(_v) = _t->isSaved; break;
+        case 0: *reinterpret_cast< bool*>(_v) = _t->isSaved; break;
+        case 1: *reinterpret_cast< int*>(_v) = _t->chiffre_IsActif; break;
+        case 2: *reinterpret_cast< QList<QList<QString> >*>(_v) = _t->valeurs; break;
+        case 3: *reinterpret_cast< QList<QList<QString> >*>(_v) = _t->colors; break;
+        case 4: *reinterpret_cast< int*>(_v) = _t->verif; break;
         default: break;
         }
     } else if (_c == QMetaObject::WriteProperty) {
@@ -209,35 +209,35 @@ void Grille::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void
         void *_v = _a[0];
         switch (_id) {
         case 0:
+            if (_t->isSaved != *reinterpret_cast< bool*>(_v)) {
+                _t->isSaved = *reinterpret_cast< bool*>(_v);
+                Q_EMIT _t->gameIsSaved();
+            }
+            break;
+        case 1:
+            if (_t->chiffre_IsActif != *reinterpret_cast< int*>(_v)) {
+                _t->chiffre_IsActif = *reinterpret_cast< int*>(_v);
+                Q_EMIT _t->chiffreActifChanged();
+            }
+            break;
+        case 2:
             if (_t->valeurs != *reinterpret_cast< QList<QList<QString> >*>(_v)) {
                 _t->valeurs = *reinterpret_cast< QList<QList<QString> >*>(_v);
                 Q_EMIT _t->valChanged();
             }
             break;
-        case 1:
+        case 3:
             if (_t->colors != *reinterpret_cast< QList<QList<QString> >*>(_v)) {
                 _t->colors = *reinterpret_cast< QList<QList<QString> >*>(_v);
                 Q_EMIT _t->focusChanged();
             }
             break;
-        case 2:
+        case 4:
             if (_t->verif != *reinterpret_cast< int*>(_v)) {
                 _t->verif = *reinterpret_cast< int*>(_v);
                 Q_EMIT _t->verifClicked();
             }
             break;
-        case 3:
-            if (_t->chiffre_IsActif != *reinterpret_cast< int*>(_v)) {
-                _t->chiffre_IsActif = *reinterpret_cast< int*>(_v);
-                Q_EMIT _t->chiffreActifChanged();
-            }
-            break;
-        case 4:
-            if (_t->isSaved != *reinterpret_cast< bool*>(_v)) {
-                _t->isSaved = *reinterpret_cast< bool*>(_v);
-                Q_EMIT _t->gameIsSaved();
-            }
-            break;
         default: break;
         }
     } else if (_c == QMetaObject::ResetProperty) {
diff --git a/debug/moc_grille.o b/debug/moc_grille.o
index c88781e4572dfc56b0da028252d5da21959aedd3..bec19bc23ea5ea134052068bbf3d3bd38c221065 100644
Binary files a/debug/moc_grille.o and b/debug/moc_grille.o differ
diff --git a/debug/qrc_qml.cpp b/debug/qrc_qml.cpp
index 496343c583b70979d9bb34958a6456d709433547..f7f56eb73e0fa4931f4935e36b84b9fc0b8f1e50 100644
--- a/debug/qrc_qml.cpp
+++ b/debug/qrc_qml.cpp
@@ -104,128 +104,130 @@ static const unsigned char qt_resource_data[] = {
   0x7f,0xbe,0x6c,0xda,0x86,0x7c,0x2f,0x2e,0x4f,0x7c,0x64,0x9f,0xa7,0x9f,0x9a,0x11,
   0x84,0xb6,
     // C:/Users/Simon/Documents/travail/ECL/Electifs/Programmation des interfaces graphiques en C++/Projet/projet_sudoku/main.qml
-  0x0,0x0,0x7,0x7e,
+  0x0,0x0,0x7,0x91,
   0x0,
-  0x0,0x2f,0x3e,0x78,0x9c,0xed,0x9a,0xdd,0x6e,0xdb,0x36,0x14,0xc7,0xef,0x3,0xe4,
-  0x1d,0x58,0xf7,0x62,0x9,0xba,0xb9,0x96,0xbf,0xa3,0xcc,0x18,0xda,0xa0,0xdd,0x2,
-  0xb4,0x6b,0x9b,0x16,0xed,0x45,0x11,0x18,0x8c,0x44,0xdb,0x8c,0x69,0x4a,0x21,0xa9,
-  0x7c,0x34,0xc8,0x3,0xf5,0x39,0xfa,0x62,0x23,0x25,0x4b,0x16,0x29,0x5a,0x92,0x3b,
-  0xfb,0x62,0x43,0x78,0xd1,0x5a,0xe4,0x21,0x75,0xf8,0xfb,0x9f,0x43,0x49,0x64,0xf0,
-  0x22,0xc,0x98,0x0,0x1f,0xc4,0x87,0x8,0x7b,0x73,0xd0,0x6e,0x3a,0xce,0xfe,0x1e,
-  0xd6,0x2a,0x9b,0x5f,0x30,0xf5,0x83,0x1b,0x7b,0xdb,0x1b,0x78,0x17,0x44,0x82,0x3,
-  0xa7,0x59,0x6c,0x3b,0x9,0xa8,0x60,0x1,0xe1,0xaa,0x67,0x6f,0x7f,0x6f,0x7f,0x6f,
-  0x39,0xd0,0xfd,0xfe,0x1e,0x90,0x5,0xfb,0xc0,0x5,0x2c,0x8,0x44,0x72,0xe9,0x5,
-  0x24,0x60,0x2e,0x68,0x3c,0x45,0x7d,0xe4,0x4d,0x60,0x23,0xa9,0xbd,0xc1,0xbe,0x98,
-  0xb9,0xa0,0xdf,0xeb,0x25,0xd7,0x33,0x84,0xa7,0x33,0xe1,0x82,0x81,0x33,0x48,0x2a,
-  0xae,0x31,0xc7,0x17,0x4,0xb9,0x40,0xb0,0x8,0x25,0x55,0x2,0xb,0x55,0x71,0xc5,
-  0x3f,0xb1,0x83,0xc6,0xc7,0xc8,0xf,0xe6,0x51,0xe3,0x50,0xdd,0x5f,0x35,0x4e,0x22,
-  0xea,0x9,0x1c,0x50,0xe0,0xcd,0x90,0x37,0x3f,0x38,0x5c,0x3a,0x13,0xf,0x15,0xa1,
-  0x77,0x17,0x97,0x48,0x9c,0x84,0xa2,0x79,0x8d,0x18,0x9e,0x8c,0x17,0x50,0x30,0xec,
-  0xa1,0x83,0xc3,0xe3,0x9c,0x15,0x64,0x20,0x6e,0x5,0xa3,0x62,0xf,0x8c,0x58,0xce,
-  0x14,0x4f,0xe,0xe2,0xda,0xd1,0x68,0xe4,0xe4,0x6f,0xa4,0xa,0x43,0x3c,0x22,0xb2,
-  0x57,0xe2,0xfe,0x48,0x79,0x7f,0x6c,0xb5,0x60,0xc8,0x13,0x90,0x4e,0x9,0x6a,0xc6,
-  0x84,0x46,0x8d,0xa7,0x43,0x84,0xfa,0x9d,0x41,0xa3,0xca,0x5c,0xa0,0x5b,0xe1,0xc4,
-  0xff,0x8e,0x1a,0x2f,0x19,0xbc,0xe,0xc0,0x75,0x10,0x71,0x0,0xaf,0xd1,0x37,0xc0,
-  0x7e,0x7c,0x8f,0x38,0xc7,0x80,0x40,0x10,0x42,0x26,0x30,0x2,0x4f,0xf2,0xe3,0x3d,
-  0xac,0x7e,0x22,0xc2,0xd1,0xfd,0xbf,0x72,0xb7,0x1f,0x97,0x8d,0xdc,0x3d,0x25,0xe0,
-  0xe,0x40,0x10,0x51,0x4,0x10,0x63,0x28,0x62,0xbf,0x2a,0x8f,0x11,0xe7,0xf0,0x4e,
-  0x3a,0x6f,0x73,0xf5,0xa1,0xa0,0x2f,0x97,0x13,0x1d,0x7b,0x44,0x6,0x22,0xf2,0xd7,
-  0xca,0x1c,0x1b,0x4d,0x19,0xf6,0xb,0x12,0x63,0xfe,0x51,0xb6,0xf9,0x86,0xc8,0x53,
-  0xb8,0x40,0xa7,0x49,0x8b,0xd6,0x43,0x2a,0xbd,0xec,0x60,0xd3,0x5a,0xdd,0xc5,0x1f,
-  0xfb,0x98,0x87,0x4,0xde,0xa5,0xc,0xe5,0xc8,0x6,0x45,0x93,0xfa,0x4f,0xd,0x52,
-  0x30,0x1d,0x2b,0xa4,0x89,0x18,0xd2,0xba,0xc1,0x90,0x5f,0xf,0x1f,0x12,0x63,0x6f,
-  0x86,0x27,0x13,0x86,0xc6,0x50,0x56,0xc9,0x9,0xae,0x85,0x68,0x31,0x35,0x68,0xa6,
-  0xcd,0xa7,0xfc,0x85,0x32,0x30,0xa8,0xc6,0xce,0x41,0x75,0x5b,0x23,0xcd,0x20,0x89,
-  0x10,0x37,0xf3,0x2c,0xae,0x34,0xc6,0x27,0xc6,0xed,0x56,0x97,0x93,0x80,0x1d,0x90,
-  0x51,0xeb,0x98,0xfc,0x7e,0x74,0x4c,0x9e,0x3d,0x33,0xa5,0x51,0xcd,0x9e,0x6c,0xf6,
-  0x64,0xb3,0x57,0x6c,0xce,0x3c,0x91,0x4e,0x30,0x14,0x22,0x28,0x10,0x6b,0x62,0x81,
-  0x16,0x2f,0xc4,0x1,0x39,0x94,0xd1,0x1b,0xa6,0x57,0xde,0x61,0x13,0xd3,0x30,0x12,
-  0x96,0xfe,0x49,0x50,0x27,0x7e,0x7f,0x25,0xe7,0x5f,0xbd,0x73,0x43,0xaf,0x87,0xf5,
-  0x7a,0x9c,0x4,0x72,0x4d,0xa5,0x88,0x8a,0x66,0x40,0xd5,0x6f,0x82,0x4,0xf2,0xdd,
-  0x7b,0x1b,0xa7,0x51,0x25,0x25,0x7c,0xac,0x73,0xc1,0x72,0xe2,0x58,0x4e,0x1c,0x17,
-  0x27,0xae,0xcc,0x85,0x65,0xd2,0x2d,0x6d,0xd2,0xd8,0x3a,0x69,0xa1,0x4d,0xb8,0x75,
-  0xfe,0x15,0x9f,0xeb,0x6,0x6a,0x5d,0xcc,0x35,0x3e,0x19,0x8d,0x7e,0xf9,0xc5,0x46,
-  0x5e,0x2d,0xf,0xd0,0x7f,0x47,0xc9,0xdd,0x68,0xb5,0xba,0xeb,0x6,0xe9,0x22,0xd3,
-  0x8a,0x4b,0xc3,0x66,0x32,0x91,0x8f,0xa1,0xe6,0x45,0x40,0xfc,0x65,0xb2,0x54,0xb1,
-  0xaf,0x49,0x67,0x6e,0xa1,0xe3,0xd4,0xa0,0x33,0xd7,0xe8,0x38,0x65,0x74,0x9c,0x52,
-  0x3a,0xf3,0x2a,0x3a,0xf3,0x6a,0x3a,0xf3,0x5d,0xd1,0x21,0x16,0x3a,0xed,0x1a,0x74,
-  0x88,0x46,0xa7,0x5d,0x46,0xa7,0x5d,0x4a,0x87,0x54,0xd1,0x21,0xd5,0x74,0xc8,0xae,
-  0xe8,0x2c,0x2c,0x74,0x3a,0x35,0xe8,0x2c,0x34,0x3a,0x9d,0x32,0x3a,0x9d,0x52,0x3a,
-  0x8b,0x2a,0x3a,0x8b,0x6a,0x3a,0x8b,0x5d,0xd1,0xa1,0x16,0x3a,0xdd,0x1a,0x74,0xa8,
-  0x46,0xa7,0x5b,0x46,0xa7,0x5b,0x4a,0x87,0x56,0xd1,0xa1,0xd5,0x74,0xe8,0xae,0xe8,
-  0x84,0x16,0x3a,0xbd,0x1a,0x74,0x42,0x8d,0x4e,0xaf,0x8c,0x4e,0xaf,0x94,0x4e,0x58,
-  0x45,0x27,0xac,0xa6,0x13,0xee,0x8a,0xce,0x95,0x85,0x4e,0xbf,0x6,0x9d,0x2b,0x8d,
-  0x4e,0xbf,0x8c,0x4e,0xbf,0x94,0xce,0x55,0x15,0x9d,0xab,0x6a,0x3a,0x57,0xbb,0xa2,
-  0xc3,0x2d,0x74,0x6,0x35,0xe8,0x70,0x8d,0xce,0xa0,0x8c,0xce,0xa0,0x94,0xe,0xaf,
-  0xa2,0xc3,0xab,0xe9,0xf0,0x5d,0xd1,0xb9,0xb4,0xd0,0x19,0xd6,0xa0,0x73,0xa9,0xd1,
-  0x19,0x96,0xd1,0x19,0x96,0xd2,0xb9,0xac,0xa2,0x73,0x59,0x4d,0xe7,0x72,0x63,0x3a,
-  0xcb,0xff,0x42,0x16,0x84,0x88,0x9,0xf9,0xdd,0x45,0x30,0xe4,0x19,0x8,0xf5,0x8d,
-  0xbe,0xfc,0x99,0xbe,0x93,0xbe,0x45,0x34,0x7a,0x29,0x79,0xe5,0x66,0x80,0x7d,0x17,
-  0x2c,0x92,0xea,0xd4,0x2a,0xb5,0x4,0xf7,0xfa,0x7,0xf9,0x6b,0x4c,0x90,0xfa,0x1c,
-  0xcf,0x3b,0xf5,0x22,0xf9,0xe6,0x90,0x96,0x12,0x64,0x6a,0xf8,0x37,0xba,0x1,0x89,
-  0xf1,0x43,0xd,0x6b,0xf5,0xf1,0x5,0xbc,0x48,0x7e,0x2d,0x52,0x1,0xd4,0x67,0x9a,
-  0x79,0xf,0x55,0x2,0xfa,0x89,0xe1,0xe9,0x14,0xc9,0x8f,0x20,0xd7,0xf8,0x40,0xd4,
-  0xb9,0xac,0x2e,0x7c,0x44,0xd0,0x54,0xce,0xde,0x4d,0xa7,0x7d,0x2a,0x43,0x1,0x18,
-  0xe2,0xe5,0xa6,0xaf,0x9a,0xf3,0xfd,0x55,0xf1,0xa4,0x22,0xd2,0x2d,0xd5,0xe4,0x82,
-  0x4f,0xd2,0x69,0xb3,0xbf,0x2a,0xc9,0x64,0x72,0xa3,0xc4,0x51,0x55,0xb4,0x53,0xf2,
-  0xea,0x76,0xaa,0xc6,0x32,0xd7,0x10,0x7a,0x58,0xdc,0xb9,0x0,0x51,0x28,0xbf,0x14,
-  0x7d,0xf0,0x7,0x70,0xa4,0x98,0xad,0x66,0xa7,0x68,0xbb,0xdc,0x7b,0xc9,0xf,0x3a,
-  0xc3,0xd3,0x19,0x51,0x7b,0x2d,0x71,0xcf,0xc6,0xd3,0x49,0x5c,0x1a,0x40,0xed,0xd0,
-  0xac,0xd,0xbe,0x59,0xc0,0xf0,0x37,0xe9,0xd,0x24,0x2f,0x64,0x5f,0x2a,0xc7,0x13,
-  0xc9,0x84,0x9b,0xf1,0xf5,0x1b,0x34,0xb1,0x7d,0x1f,0xc9,0xa8,0xc3,0xde,0x9a,0x2e,
-  0x9f,0x4f,0x64,0x85,0xa,0x3d,0xb3,0x17,0x22,0xd8,0x47,0x4b,0xcb,0x57,0xea,0xf7,
-  0x99,0x72,0xb6,0x10,0xeb,0x7a,0xc5,0x5,0xf4,0xe6,0x53,0x16,0x44,0x54,0xea,0x75,
-  0x96,0xee,0x3c,0xd8,0xc4,0x88,0xf7,0xa6,0x56,0xd6,0x63,0x45,0xe6,0x2,0x5a,0xdc,
-  0xc0,0xf2,0x93,0xc,0x4b,0xce,0x5f,0x92,0x7d,0xaa,0x6e,0x6b,0xbd,0xc9,0x5f,0xcb,
-  0xad,0x2b,0x9b,0xcd,0x96,0xc5,0x3a,0x42,0x10,0x7a,0xc3,0x58,0x2c,0xc1,0x20,0xe5,
-  0x21,0x54,0x69,0xd1,0x28,0x5b,0x9,0x56,0x17,0xb5,0x20,0x3d,0x7f,0xe,0xb2,0xad,
-  0x1b,0xe0,0x47,0xb1,0x37,0x66,0x4e,0x80,0xc4,0xc9,0xf1,0x6a,0x40,0xc3,0xa2,0x9c,
-  0x5d,0x15,0xb7,0x6c,0xc3,0x70,0x19,0x9a,0x5,0x7,0x73,0xe5,0x22,0x60,0xbe,0x5c,
-  0xd4,0x97,0xbb,0x89,0x4e,0xd,0xd3,0x6c,0xf4,0x2c,0xd8,0xcd,0x60,0x2a,0xd,0x20,
-  0x39,0x26,0x81,0x12,0xa5,0x5c,0x8f,0x0,0xd,0xb0,0xfc,0x17,0x51,0xb9,0x96,0x70,
-  0xae,0xb6,0xe0,0xac,0xbc,0xb4,0x29,0xad,0xcd,0xb0,0xe5,0xc,0x12,0x41,0x93,0xf9,
-  0x58,0xd2,0x70,0x49,0xcc,0x29,0x36,0x41,0xea,0xc9,0x24,0xe5,0xf2,0xf9,0x20,0x44,
-  0xb0,0xc8,0x6,0x4a,0x2e,0x6b,0x3c,0x29,0x52,0x8,0xd9,0xe4,0xb5,0x87,0x80,0x96,
-  0x34,0xab,0x86,0x5b,0x37,0x17,0xc6,0x77,0xf9,0x8b,0x64,0x5b,0x4a,0xce,0xf8,0x82,
-  0xc8,0x7e,0xb9,0xf9,0xa6,0x7e,0xa6,0x8b,0x43,0xb2,0xc,0x64,0xfe,0xea,0xd5,0x55,
-  0xdd,0xde,0x4d,0x26,0x1c,0x49,0x1e,0xbf,0x75,0x5a,0x45,0xd3,0xd5,0x9a,0x65,0xdc,
-  0xc3,0x6c,0x58,0x75,0x8d,0xb1,0x4b,0xaf,0xbd,0x19,0x26,0xbe,0xb4,0x55,0x30,0x12,
-  0x2d,0x9e,0xf5,0x57,0x56,0x89,0xa,0xa6,0x59,0x52,0xab,0xec,0xf2,0xf1,0xf4,0x27,
-  0xc3,0x7e,0xe1,0x99,0x22,0xbb,0xaa,0xad,0x49,0xbd,0xfa,0xd6,0x5,0xc6,0x9a,0xa0,
-  0x1,0x55,0x85,0x5,0x37,0xdc,0xac,0x93,0xa0,0xa3,0x5,0x2d,0x54,0x73,0xb5,0xee,
-  0xd0,0x29,0x70,0xdb,0x66,0x6c,0x27,0x8f,0xfc,0x75,0x4b,0xe3,0xea,0x95,0xc0,0x6c,
-  0x5e,0x4,0xf2,0x89,0x29,0x2d,0x8e,0xcc,0x74,0x51,0xe5,0x44,0xe5,0x83,0x65,0xcc,
-  0x6c,0x5c,0xf,0x72,0x64,0x89,0x5a,0x55,0x52,0xe8,0x6d,0xc7,0xb2,0x26,0xaa,0xb2,
-  0x8c,0x7a,0x6b,0xfb,0x43,0xad,0xd0,0x56,0x3f,0x5e,0x46,0x32,0x13,0xa8,0xf9,0x6e,
-  0x73,0x11,0xd7,0x8e,0xe3,0x33,0x83,0x7c,0x5c,0x83,0x61,0x3e,0xb0,0x41,0xbf,0xdf,
-  0x32,0xa2,0x44,0x26,0x61,0xa7,0x6d,0xc6,0x84,0xbe,0x96,0xe5,0xdf,0x62,0x3e,0xff,
-  0xf8,0x9e,0x9c,0x22,0xa8,0xd5,0x43,0x8a,0x4f,0xf4,0x77,0xa5,0x9a,0xd9,0x9b,0x7b,
-  0x1c,0xb8,0x60,0x2,0x9,0x47,0xd5,0x61,0x9f,0xe5,0x48,0xbb,0xb7,0x9d,0x24,0xd1,
-  0x7d,0x7d,0xb,0xd9,0x14,0x53,0x49,0x23,0x37,0x78,0xfc,0xa2,0x7a,0xb3,0x24,0xf2,
-  0x5a,0x5d,0xbc,0xba,0x95,0x8f,0xab,0x37,0xfa,0x83,0x3c,0xb6,0xa,0x3,0x4c,0xc5,
-  0x47,0xfc,0x4d,0x3e,0xf1,0x9d,0x1c,0xce,0x80,0x9e,0x24,0xef,0x6f,0xee,0x7d,0x7a,
-  0x9e,0x63,0x6c,0xad,0xe6,0x85,0xd3,0x1e,0x93,0xe6,0xbb,0xb1,0x19,0x7,0x67,0xf1,
-  0xf9,0x4,0x14,0xc6,0xfa,0x96,0x1c,0x5b,0xac,0xea,0xb2,0xe3,0xa7,0x1c,0xe6,0x5a,
-  0xb1,0xe4,0x68,0x61,0xd4,0x6e,0xb5,0x2a,0x3,0x29,0x1f,0x33,0x55,0x71,0xe4,0xfc,
-  0x44,0xd4,0x54,0x46,0x86,0xd3,0xfe,0x2f,0x45,0xc6,0x7b,0x29,0x15,0x57,0x9,0x70,
-  0x5f,0x94,0xfd,0x21,0x6f,0x78,0x26,0xdf,0xf0,0x61,0xc1,0x72,0x94,0x28,0xfa,0x60,
-  0xb,0xb6,0xe2,0x81,0x87,0x73,0xb8,0x81,0xf4,0x6d,0x5d,0xfa,0xde,0x76,0xa5,0x6f,
-  0xef,0x42,0xfa,0xc1,0xa3,0xf2,0xb1,0xf2,0x96,0x63,0xb1,0xf6,0x26,0xd2,0x77,0x34,
-  0xe9,0x3b,0x5b,0xce,0xfa,0xce,0x2e,0xa4,0x7f,0x4c,0xfa,0xb5,0xd2,0x77,0x36,0x91,
-  0xbe,0xab,0x4b,0xbf,0xe5,0xac,0xef,0xee,0x40,0xfa,0x2d,0xbd,0x2d,0xff,0x1f,0x95,
-  0xef,0x6e,0xa2,0x7c,0x4f,0x53,0xbe,0xbb,0xe5,0xa4,0xef,0xed,0x40,0xf9,0xe1,0xa3,
-  0xf2,0xeb,0x94,0xef,0x6d,0xa2,0x7c,0x5f,0x57,0x7e,0xcb,0x39,0xdf,0xdf,0x81,0xf2,
-  0xce,0x63,0xd2,0xaf,0x95,0xbe,0xbf,0x89,0xf4,0x3,0x4d,0xfa,0xde,0x96,0x93,0x7e,
-  0xb0,0xb,0xe9,0x1f,0xb3,0x7e,0xad,0xf4,0x83,0x4d,0xa4,0x1f,0xea,0xd2,0x6f,0x39,
-  0xeb,0x87,0x3b,0x90,0xbe,0xfd,0x98,0xf5,0x6b,0xa5,0x1f,0x6e,0x22,0xfd,0x91,0x26,
-  0x7d,0x7f,0xcb,0x59,0x7f,0xb4,0xb,0xe9,0x1f,0xb3,0x7e,0xad,0xf4,0x47,0xa6,0xf4,
-  0x6b,0x77,0xbd,0xb5,0xbf,0xb8,0x5c,0xb5,0xd9,0x76,0x87,0x32,0xed,0xd3,0x9d,0x61,
-  0x73,0x17,0x5f,0xdf,0x37,0x5e,0x6e,0x18,0x6f,0x4d,0xf7,0xac,0x3,0xd1,0xe,0xe3,
-  0xec,0xf2,0xa9,0x40,0x5c,0xd9,0xd8,0x4e,0x2e,0xb1,0xef,0x5a,0xfe,0xdc,0x54,0xb7,
-  0xc9,0x26,0x64,0x9e,0xe0,0x28,0x17,0xde,0x43,0xdf,0xc7,0x74,0xaa,0x87,0x8a,0x2a,
-  0x6a,0x1c,0x90,0x46,0xfe,0xfb,0xe4,0x8f,0x94,0x39,0x8c,0xae,0xd1,0x14,0x32,0xff,
-  0xc7,0xf7,0xc2,0xf9,0x6e,0xbd,0xf0,0xca,0x2c,0xd7,0x84,0x98,0x2a,0xd9,0xa1,0x44,
-  0xf1,0x18,0x66,0xb5,0x4b,0x18,0xc7,0xc4,0x3f,0xb1,0xed,0x82,0x38,
+  0x0,0x2f,0x42,0x78,0x9c,0xed,0x9a,0xdd,0x6e,0xdb,0x38,0x16,0xc7,0xef,0xb,0xf4,
+  0x1d,0x38,0xee,0xc5,0x24,0xe8,0xae,0xc7,0xb2,0xe3,0x8f,0x38,0x6b,0x2c,0xda,0x60,
+  0x3e,0xa,0x74,0xa6,0x9d,0xb6,0x98,0xb9,0x28,0xa,0x83,0x96,0x68,0x9b,0x31,0x4d,
+  0x29,0x24,0x95,0x34,0xd,0xf2,0x40,0x7d,0x8e,0xbe,0xd8,0x1e,0x4a,0x96,0x2c,0x52,
+  0xb4,0x24,0xcf,0xda,0x17,0x33,0x8,0x2f,0x5a,0x8b,0x3c,0xa4,0xe,0x7f,0xff,0x73,
+  0x28,0x89,0xc,0x5d,0x47,0xa1,0x50,0xe8,0x77,0xf5,0x7b,0x4c,0xfd,0x15,0xea,0xb6,
+  0x3d,0xef,0xe9,0x13,0x6a,0x54,0xb6,0xff,0xa4,0x3c,0x8,0x6f,0xdd,0x6d,0xaf,0xf1,
+  0x5d,0x18,0x2b,0x89,0xbc,0x76,0xb9,0xed,0x32,0xe4,0x4a,0x84,0x4c,0xea,0x9e,0xfd,
+  0xa7,0x4f,0x9e,0x3e,0xd9,0xc,0x74,0xff,0xf4,0x9,0x82,0x42,0x3,0x34,0x46,0x22,
+  0xc,0x55,0x7a,0xe9,0x87,0x2c,0x14,0x63,0xd4,0x7a,0x46,0x6,0xc4,0x9f,0xe3,0x56,
+  0x5a,0x7b,0x4b,0x3,0xb5,0x1c,0xa3,0x41,0xbf,0x9f,0x5e,0x2f,0x9,0x5d,0x2c,0xd5,
+  0x18,0xd,0xbd,0x61,0x5a,0x71,0x43,0x25,0x9d,0x31,0x32,0x46,0x4a,0xc4,0x24,0xad,
+  0x52,0x54,0xe9,0x8a,0x6b,0xf9,0x41,0x9c,0xb4,0xde,0xc7,0x41,0xb8,0x8a,0x5b,0xa7,
+  0xfa,0xfe,0xba,0x71,0x1e,0x73,0x5f,0xd1,0x90,0x23,0x7f,0x49,0xfc,0xd5,0xc9,0xe9,
+  0xc6,0x99,0x64,0xa8,0x98,0xbc,0x99,0x5d,0x11,0x75,0x19,0xa9,0xf6,0xd,0x11,0x74,
+  0x3e,0x5d,0x63,0x25,0xa8,0x4f,0x4e,0x4e,0x2f,0xa,0x56,0x58,0xa0,0xa4,0x15,0x4d,
+  0xca,0x3d,0x28,0x11,0x5,0x53,0x3a,0x3f,0x49,0x6a,0x27,0x93,0x89,0x57,0xbc,0x91,
+  0x2e,0x82,0xc8,0x98,0x41,0xaf,0xd4,0xfd,0x89,0xf6,0xfe,0xc2,0x69,0x21,0x88,0xaf,
+  0x30,0x5f,0x30,0xd2,0x4e,0x8,0x4d,0x5a,0xcf,0x46,0x84,0xc,0x7a,0xc3,0x56,0x9d,
+  0xb9,0x22,0x9f,0x95,0x97,0xfc,0x3b,0x69,0xbd,0x14,0xf8,0x26,0x44,0x37,0x61,0x2c,
+  0x11,0xbe,0x21,0x5f,0x90,0xf8,0xf6,0x35,0x96,0x92,0x22,0x86,0x51,0x84,0x85,0xa2,
+  0x4,0x7d,0x57,0x1c,0xef,0x61,0xfb,0x93,0x30,0x49,0xee,0xff,0x2f,0x77,0x7,0x49,
+  0xd9,0xcb,0xdd,0x57,0xc,0xdd,0x21,0x8c,0x62,0x4e,0x10,0x11,0x82,0xc4,0xe2,0x5f,
+  0xda,0x63,0x22,0x25,0xbe,0x3,0xe7,0x5d,0xae,0x3e,0x94,0xf4,0x95,0x30,0xd1,0xa9,
+  0xcf,0x20,0x10,0x49,0xb0,0x53,0xe6,0xc4,0x68,0x21,0x68,0x50,0x92,0x98,0xca,0xf7,
+  0xd0,0x16,0x58,0x22,0x2f,0xf0,0x9a,0xbc,0x4a,0x5b,0x8c,0x1e,0xa0,0xf4,0xa6,0x83,
+  0x4b,0x6b,0x7d,0x97,0x60,0x1a,0x50,0x19,0x31,0x7c,0x97,0x31,0x84,0x91,0x2d,0x8a,
+  0x36,0xf5,0xbf,0x34,0x48,0xc9,0x74,0xaa,0x91,0xa6,0x62,0x80,0x75,0x4b,0x90,0xa0,
+  0x19,0x3e,0xa2,0xa6,0xfe,0x92,0xce,0xe7,0x82,0x4c,0x31,0x54,0xc1,0x4,0x77,0x41,
+  0xf4,0x97,0xa0,0x20,0x11,0xd3,0x1b,0xcc,0x40,0xaa,0xe9,0xc,0x16,0x84,0x90,0x83,
+  0xb9,0x45,0x34,0x1b,0xed,0x95,0x7c,0xa1,0xc7,0xb3,0xc8,0x26,0xe,0x62,0x7d,0x6b,
+  0x2b,0xd5,0x30,0x8b,0x89,0xb4,0x73,0x2d,0xa9,0xb4,0xc6,0x67,0xd6,0xed,0xb6,0x97,
+  0xf3,0x50,0x9c,0xb0,0x49,0xe7,0x82,0xfd,0xe7,0xfc,0x82,0x3d,0x7f,0x6e,0xcb,0xa3,
+  0x9b,0x7d,0x68,0xf6,0xa1,0xd9,0x2f,0x37,0xe7,0x9e,0x80,0x13,0x82,0x44,0x4,0x2b,
+  0x22,0xda,0x54,0x91,0xf5,0xb,0x75,0xc2,0x4e,0x21,0x82,0xa3,0xec,0xca,0x3f,0x6d,
+  0x53,0x1e,0xc5,0xca,0xd1,0x3f,0xd,0xec,0xd4,0xef,0x8f,0xec,0xd3,0x47,0xff,0x93,
+  0xa5,0xd9,0xc3,0x6e,0x4d,0x2e,0x43,0x58,0x57,0x39,0xe1,0xaa,0x1d,0x72,0xfd,0x9b,
+  0x11,0x45,0x82,0xf1,0xbd,0x8b,0xd3,0xa4,0x96,0x12,0xbd,0x30,0xb9,0x50,0x98,0x38,
+  0x85,0x89,0xd3,0xf2,0xc4,0xb5,0xb9,0x72,0x4c,0xba,0x63,0x4c,0x9a,0x3a,0x27,0xad,
+  0x8c,0x9,0x77,0x3e,0x7d,0xa4,0x9f,0x4c,0x3,0xbd,0x36,0x16,0x1a,0xbf,0x9b,0x4c,
+  0xbe,0xff,0xde,0x45,0x5e,0x2f,0x11,0x38,0x78,0xc3,0xd9,0xdd,0x64,0xbb,0xc2,0x9b,
+  0x6,0xd9,0x42,0xd3,0x49,0x4a,0xcb,0x65,0x32,0x87,0x47,0x51,0x7b,0x16,0xb2,0x60,
+  0x93,0x30,0x75,0xec,0x1b,0xd2,0x59,0x39,0xe8,0x78,0xd,0xe8,0xac,0xc,0x3a,0x5e,
+  0x15,0x1d,0xaf,0x92,0xce,0xaa,0x8e,0xce,0xaa,0x9e,0xce,0xea,0x58,0x74,0x98,0x83,
+  0x4e,0xb7,0x1,0x1d,0x66,0xd0,0xe9,0x56,0xd1,0xe9,0x56,0xd2,0x61,0x75,0x74,0x58,
+  0x3d,0x1d,0x76,0x2c,0x3a,0x6b,0x7,0x9d,0x5e,0x3,0x3a,0x6b,0x83,0x4e,0xaf,0x8a,
+  0x4e,0xaf,0x92,0xce,0xba,0x8e,0xce,0xba,0x9e,0xce,0xfa,0x58,0x74,0xb8,0x83,0xce,
+  0x59,0x3,0x3a,0xdc,0xa0,0x73,0x56,0x45,0xe7,0xac,0x92,0xe,0xaf,0xa3,0xc3,0xeb,
+  0xe9,0xf0,0x63,0xd1,0x89,0x1c,0x74,0xfa,0xd,0xe8,0x44,0x6,0x9d,0x7e,0x15,0x9d,
+  0x7e,0x25,0x9d,0xa8,0x8e,0x4e,0x54,0x4f,0x27,0x3a,0x16,0x9d,0x6b,0x7,0x9d,0x41,
+  0x3,0x3a,0xd7,0x6,0x9d,0x41,0x15,0x9d,0x41,0x25,0x9d,0xeb,0x3a,0x3a,0xd7,0xf5,
+  0x74,0xae,0x8f,0x45,0x47,0x3a,0xe8,0xc,0x1b,0xd0,0x91,0x6,0x9d,0x61,0x15,0x9d,
+  0x61,0x25,0x1d,0x59,0x47,0x47,0xd6,0xd3,0x91,0xc7,0xa2,0x73,0xe5,0xa0,0x33,0x6a,
+  0x40,0xe7,0xca,0xa0,0x33,0xaa,0xa2,0x33,0xaa,0xa4,0x73,0x55,0x47,0xe7,0xaa,0x9e,
+  0xce,0xd5,0xde,0x74,0x36,0xff,0x45,0x22,0x8c,0x88,0x50,0xf0,0xed,0xc5,0x28,0x96,
+  0x39,0x8,0xfd,0x9d,0xbe,0xf9,0x99,0xbd,0x93,0xfe,0x4a,0x78,0xfc,0x12,0x78,0x15,
+  0x66,0x40,0x83,0x31,0x5a,0xa7,0xd5,0x99,0x55,0x66,0x89,0xee,0xcd,0x8f,0xf2,0x9f,
+  0x28,0x23,0xfa,0x93,0xbc,0xe8,0xd4,0x8b,0xf4,0xbb,0x3,0x2c,0x1,0x64,0x66,0xf8,
+  0x1b,0xb9,0x45,0xa9,0xf1,0x43,0x3,0x6b,0xfd,0x1,0x86,0xfc,0x18,0xbe,0x18,0xb9,
+  0x42,0xfa,0x53,0xcd,0xbe,0x87,0x2e,0x21,0xff,0x20,0xe8,0x2,0xbe,0x57,0xe0,0x1d,
+  0xda,0xfa,0x48,0x34,0xb9,0x6c,0x2f,0x2,0xc2,0xc8,0x2,0x66,0x3f,0xce,0xa6,0xfd,
+  0xa,0x42,0x1,0x59,0xe2,0x15,0xa6,0xaf,0x9b,0x8b,0xfd,0x75,0xf1,0x41,0x11,0x70,
+  0x4b,0x37,0x8d,0xd1,0x7,0x70,0xda,0xee,0xaf,0x4b,0x3a,0x99,0xc2,0x28,0x49,0x54,
+  0x95,0xed,0xb4,0xbc,0xa6,0x9d,0xae,0x71,0xcc,0x35,0xc2,0x3e,0x55,0x77,0x63,0x44,
+  0x38,0x86,0xaf,0xc5,0x0,0xfd,0x17,0x79,0x20,0x66,0xa7,0xdd,0x2b,0xdb,0x6e,0xf6,
+  0x5f,0x8a,0x83,0x2e,0xe9,0x62,0xc9,0xf4,0x7e,0x4b,0xd2,0xb3,0xf5,0x6c,0x9e,0x94,
+  0x16,0xd2,0xbb,0x34,0x3b,0x83,0x6f,0x19,0xa,0xfa,0x5,0xbc,0xc1,0xec,0x5,0xf4,
+  0xe5,0x30,0x9e,0x4a,0x27,0xdc,0x4e,0xae,0x5f,0x93,0xb9,0xeb,0xfb,0x8,0xa2,0x8e,
+  0xfa,0x3b,0xba,0xfc,0x71,0x9,0x15,0x3a,0xf4,0xec,0x5e,0x84,0xd1,0x80,0x6c,0x2c,
+  0x7f,0xd4,0xbf,0xdf,0x69,0x67,0x4b,0xb1,0x6e,0x56,0xcc,0xb0,0xbf,0x5a,0x88,0x30,
+  0xe6,0xa0,0xd7,0xbb,0x6c,0xf7,0xc1,0x25,0x46,0xb2,0x3f,0xb5,0xb5,0x9e,0x6a,0x32,
+  0x33,0xec,0x70,0x83,0xc2,0x27,0x19,0x5,0xce,0x7f,0xa6,0x7b,0x55,0x67,0x9d,0xdd,
+  0x26,0xbf,0x6c,0xb6,0xaf,0x5c,0x36,0x7,0x16,0xeb,0x9c,0x60,0xec,0x8f,0x12,0xb1,
+  0x94,0xc0,0x5c,0x46,0x58,0xa7,0x45,0xab,0x6a,0x25,0xd8,0x5e,0x34,0x82,0xf4,0xc3,
+  0xf,0x28,0xdf,0xbe,0x41,0x41,0x9c,0x78,0x63,0xe7,0x4,0x4a,0x9d,0x9c,0x6e,0x7,
+  0xb4,0x2c,0xaa,0xd9,0xd5,0x71,0xcb,0x37,0xd,0x37,0xa1,0x59,0x72,0xb0,0x50,0x66,
+  0xa1,0x8,0x60,0x51,0xdf,0xec,0x28,0x7a,0xd,0x4c,0xf3,0xd1,0xf3,0x60,0xb7,0x83,
+  0xa9,0x32,0x80,0x60,0x4c,0x86,0x1,0x25,0xac,0x47,0x88,0x87,0x14,0xfe,0x25,0x1c,
+  0xd6,0x12,0x29,0xf5,0x36,0x9c,0x93,0x97,0x31,0xa5,0x9d,0x19,0xb6,0x99,0x41,0x2a,
+  0x68,0x3a,0x1f,0x47,0x1a,0x6e,0x88,0x79,0xe5,0x26,0xcc,0x7d,0x48,0x52,0x9,0xcf,
+  0x7,0xa5,0xc2,0x75,0x3e,0x50,0x7a,0xd9,0xe0,0x49,0x91,0x41,0xc8,0x27,0x6f,0x3c,
+  0x4,0x8c,0xa4,0xd9,0x36,0x7c,0x1e,0x17,0xc2,0xf8,0xae,0x78,0x91,0x6e,0x4d,0xc1,
+  0x8c,0x67,0xc,0xfa,0x15,0xe6,0x9b,0xf9,0x99,0x2d,0xe,0xe9,0x32,0x90,0xfb,0x6b,
+  0x56,0xd7,0x75,0x7b,0x33,0x9f,0x4b,0x2,0x3c,0xfe,0xdd,0xeb,0x94,0x4d,0xb7,0x6b,
+  0x96,0x75,0xf,0xbb,0x61,0xdb,0x35,0xc1,0xe,0x5e,0xfb,0x4b,0xca,0x2,0xb0,0xd5,
+  0x30,0x52,0x2d,0x9e,0xf,0xb6,0x56,0xa9,0xa,0xb6,0x59,0x5a,0xab,0xed,0x8a,0xf1,
+  0xf4,0xb3,0xa0,0x41,0xe9,0x99,0x2,0x5d,0xf5,0xf6,0xa4,0x59,0xfd,0x79,0x8c,0xac,
+  0x35,0xc1,0x0,0xaa,0x8b,0x8,0x6f,0xa5,0x5d,0x7,0xa0,0xe3,0x35,0x2f,0x55,0x4b,
+  0xbd,0xee,0xf0,0x5,0x1a,0x77,0xed,0xd8,0x4e,0x1f,0xf9,0xbb,0x96,0xc6,0xed,0x2b,
+  0x81,0xdd,0xbc,0xe,0xe1,0x89,0x9,0x16,0xe7,0x76,0xba,0xe8,0x72,0xa9,0xf3,0xc1,
+  0x31,0x66,0x3e,0xae,0x8f,0x25,0x71,0x44,0xad,0x2e,0x19,0xf4,0xae,0xe7,0x58,0x13,
+  0x75,0xd9,0x44,0xbd,0xb3,0xfd,0xa1,0x51,0x68,0xeb,0x1f,0x2f,0x63,0xc8,0x4,0x6e,
+  0xbf,0xdb,0xcc,0x92,0xda,0x69,0x72,0x6e,0x50,0x8c,0x6b,0x34,0x2a,0x6,0x36,0x1a,
+  0xc,0x3a,0x56,0x94,0x40,0x12,0xf6,0xba,0x76,0x4c,0x98,0x6b,0x59,0xf1,0x2d,0xe6,
+  0x8f,0x6f,0x5f,0xd3,0x93,0x4,0xbd,0x7a,0x80,0xf8,0xcc,0x7c,0x57,0x6a,0x98,0xbd,
+  0x85,0xc7,0xc1,0x18,0xcd,0x31,0x93,0xa4,0x3e,0xec,0xf3,0x1c,0xe9,0xf6,0xf,0x93,
+  0x24,0xa6,0xaf,0xbf,0x62,0xb1,0xa0,0x1c,0x68,0x14,0x6,0x4f,0x5e,0x54,0x6f,0x37,
+  0x44,0x7e,0xd2,0x17,0x3f,0x7e,0x86,0xc7,0xd5,0x6b,0xf3,0x41,0x9e,0x58,0x45,0x21,
+  0xe5,0xea,0x3d,0xfd,0x2,0x4f,0x7c,0xaf,0x80,0x33,0xe4,0x97,0xe9,0xfb,0xdb,0xf8,
+  0x3e,0x3b,0xd3,0xb1,0xb6,0x56,0x8b,0xc2,0x19,0x8f,0x49,0xfb,0xdd,0xd8,0x8e,0x83,
+  0x77,0xc9,0x19,0x5,0x56,0xd6,0xfa,0x96,0x1e,0x5d,0x6c,0xeb,0xf2,0x23,0xa8,0x2,
+  0xe6,0x46,0xb1,0xe4,0x19,0x61,0xd4,0xed,0x74,0x6a,0x3,0xa9,0x18,0x33,0x75,0x71,
+  0xe4,0xfd,0x85,0xa8,0xa9,0x8d,0xc,0xaf,0xfb,0x77,0x8a,0x8c,0xb7,0x20,0x95,0xd4,
+  0x9,0x70,0x5f,0x96,0xfd,0xa1,0x68,0xf8,0xe,0xde,0xf0,0x71,0xc9,0x72,0x92,0x2a,
+  0xfa,0xe0,0xa,0xb6,0xf2,0xf9,0x88,0x77,0xba,0x87,0xf4,0x5d,0x53,0xfa,0xfe,0x61,
+  0xa5,0xef,0x1e,0x43,0xfa,0xe1,0xa3,0xf2,0x89,0xf2,0x8e,0xa3,0xb1,0xee,0x3e,0xd2,
+  0xf7,0xc,0xe9,0x7b,0x7,0xce,0xfa,0xde,0x31,0xa4,0x7f,0x4c,0xfa,0x9d,0xd2,0xf7,
+  0xf6,0x91,0xfe,0xcc,0x94,0xfe,0xc0,0x59,0x7f,0x76,0x4,0xe9,0xf,0xf4,0xb6,0xfc,
+  0x4f,0x54,0xfe,0x6c,0x1f,0xe5,0xfb,0x86,0xf2,0x67,0x7,0x4e,0xfa,0xfe,0x11,0x94,
+  0x1f,0x3d,0x2a,0xbf,0x4b,0xf9,0xfe,0x3e,0xca,0xf,0x4c,0xe5,0xf,0x9c,0xf3,0x83,
+  0x23,0x28,0xef,0x3d,0x26,0xfd,0x4e,0xe9,0x7,0xfb,0x48,0x3f,0x34,0xa4,0xef,0x1f,
+  0x38,0xe9,0x87,0xc7,0x90,0xfe,0x31,0xeb,0x77,0x4a,0x3f,0xdc,0x47,0xfa,0x91,0x29,
+  0xfd,0x81,0xb3,0x7e,0x74,0x4,0xe9,0xbb,0x8f,0x59,0xbf,0x53,0xfa,0xd1,0x3e,0xd2,
+  0x9f,0x1b,0xd2,0xf,0xe,0x9c,0xf5,0xe7,0xc7,0x90,0xfe,0x31,0xeb,0x77,0x4a,0x7f,
+  0x6e,0x4b,0xbf,0x73,0xd7,0xdb,0xf8,0xab,0xcb,0x6d,0x9b,0x6b,0x77,0x28,0xd7,0x3e,
+  0xdb,0x19,0xb6,0x77,0xf1,0xcd,0x7d,0xe3,0xcd,0x86,0xf1,0xc1,0x74,0xcf,0x3b,0x30,
+  0xe3,0x30,0xce,0x2d,0x9f,0xe,0xc4,0xad,0x8d,0xeb,0xe4,0x92,0x6,0x63,0xc7,0x9f,
+  0x9c,0x9a,0x36,0xf9,0x84,0xec,0x13,0x1c,0xed,0xc2,0x5b,0x1c,0x4,0x94,0x2f,0xcc,
+  0x50,0xd1,0x45,0x8f,0x83,0xb2,0xc8,0x7f,0x9b,0xfe,0xa1,0xb2,0xc4,0xf1,0xd,0x59,
+  0x60,0x11,0x7c,0xfb,0x5a,0x3a,0xdf,0x6d,0x16,0x5e,0xb9,0xe5,0x8e,0x10,0xd3,0x25,
+  0x3f,0x94,0x28,0x1f,0xc3,0x6c,0x77,0x9,0x93,0x98,0xf8,0x1f,0x2c,0xcc,0x84,0xc,
+  
   
 };
 
@@ -257,7 +259,7 @@ static const unsigned char qt_resource_struct[] = {
 0x0,0x0,0x1,0x78,0xb2,0x62,0x40,0x37,
   // :/main.qml
   0x0,0x0,0x0,0x36,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x5,0x99,
-0x0,0x0,0x1,0x78,0xb6,0x3a,0xea,0x49,
+0x0,0x0,0x1,0x78,0xb7,0x3d,0x22,0xdc,
   // :/Carre.qml
   0x0,0x0,0x0,0x1e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0xc2,
 0x0,0x0,0x1,0x78,0xb2,0xb2,0x56,0xea,
diff --git a/debug/qrc_qml.o b/debug/qrc_qml.o
index 8330f61428523edb863cee2211231dfed377e9d2..278130443af08329fcdf20fe6002ffe3839419df 100644
Binary files a/debug/qrc_qml.o and b/debug/qrc_qml.o differ
diff --git a/debug/sudoku.exe b/debug/sudoku.exe
index 6aba14f9b7c6600dc7e01eb36227d2f2d85f1ec1..f5741655d50bd35baf1b74b5489c1f934a554072 100644
Binary files a/debug/sudoku.exe and b/debug/sudoku.exe differ
diff --git a/grille.cpp b/grille.cpp
index 0a8b92ac6e720df3c8ee058e211b7ca8757a9a64..434ac3a76d2e26dd58ef9701e7f197a86cd280c5 100644
--- a/grille.cpp
+++ b/grille.cpp
@@ -151,21 +151,29 @@ void Grille::grilleToValeurs(){
     valeurs = {case1,case2,case3,case4,case5,case6,case7,case8,case9};
 }
 
-void Grille::colorer_X(int i, int l){
-    /* coloriage dans les carrés i à i+3 de la ligne l */
+void Grille::coloriage_ligne(int i, int l){
+    /* coloriage dans les carrés i à i+3 avec i dans [0,2] de la ligne l dans [0,8] */
+
     for(int k =i;k<i+3;k++)
-        for(int m=l*3;m<l*3+3;m++)
+        for(int m=l*3;m<l*3+3;m++){
             colors[k][m]="#eaeaea";
+        }
 }
 
-void Grille::colorer_Y(int i, int c){
-    // coloriage dans tous les carrés de la colonne i (entre 0 et 2) de la colonne l (entre 0 et 2 également)
-    for (int k=i;k<i+7;k+=3)
-        for (int m=c;m<c+7;m+=3)
-            colors[k][m]="#eaeaea";
+void Grille::coloriage_colonne(int i, int c){
+    /* coloriage dans tous les carrés de la colonne i dans [0,2] de la colonne l dans [0,2] */
+
+    for (int k=0;k<3;k++)
+        for (int m=0;m<3;m++){
+            colors[i+3*k][c+3*m]="#eaeaea";
+        }
 }
 
 void Grille::colorer_voisins( int Carre,int Case,bool focus){
+    /* coloriage de toutes les cases dans le voisinage de la case sélectionnée,
+       c'est-à-dire dans la même ligne, la même colonne ou le même carré  */
+
+    // initialisation des variables
     caseselected[0] = Carre;
     caseselected[1]= Case;
 
@@ -185,25 +193,25 @@ void Grille::colorer_voisins( int Carre,int Case,bool focus){
         //colorer les lignes horizontales
         switch(Carre/3){
         case 0:
-            colorer_X(0,Case/3);
+            coloriage_ligne(0,Case/3);
             break;
         case 1:
-            colorer_X(3,Case/3);
+            coloriage_ligne(3,Case/3);
             break;
         case 2:
-            colorer_X(6,Case/3);
+            coloriage_ligne(6,Case/3);
             break;
         }
         // colorer les lignes verticales
         switch(Carre%3){
         case 0:
-            colorer_Y(0,Case%3);
+            coloriage_colonne(0,Case%3);
             break;
         case 1:
-            colorer_Y(1,Case%3);
+            coloriage_colonne(1,Case%3);
             break;
         case 2:
-            colorer_Y(2,Case%3);
+            coloriage_colonne(2,Case%3);
             break;
         }
         // coloriage des cases avec le même chiffre -- ne fonctionne pour l'instant
diff --git a/grille.h b/grille.h
index 4badef9dc0ac070ce44d4584bf4d7ae97df4e142..64756ea5a3c4696ea2722774d0bfd7e035844b38 100644
--- a/grille.h
+++ b/grille.h
@@ -27,8 +27,8 @@ public:
 
 private:
     void grilleToValeurs();
-    void colorer_X(int i, int l );
-    void colorer_Y(int i, int c );
+    void coloriage_ligne(int i, int l );
+    void coloriage_colonne(int i, int c );
     QList<QList<QString>> colors;   // contient les couleurs de chaque case
     QList<QList<QString>> valeurs;  // contient les valeurs de chaque case sous forme de Qstring
     string grille[9][9];            // idem que valeurs mais sous forme de string