diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..1992e5c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "unistd.h": "c"
+    }
+}
\ No newline at end of file
diff --git a/pendu b/pendu
new file mode 100755
index 0000000..e9aae90
Binary files /dev/null and b/pendu differ
diff --git a/pendu.c b/pendu.c
index c6032b4..c617115 100644
--- a/pendu.c
+++ b/pendu.c
@@ -1,7 +1,9 @@
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #define MAX_WORDS 14
 #define MAX_TRIES 6
@@ -35,6 +37,7 @@ void display_hangman(int tries) {
     }
 }
 
+<<<<<<< HEAD
 /*
 this function allow to save the last party
 
@@ -74,6 +77,11 @@ void save_party(char * status, const char * good_word, char try[]) {
         fclose(fichier); // On ferme le fichier qui a été ouvert
     }
 
+=======
+void sig_handler(int signum){
+    printf("\ntime out\n");
+    exit (1);
+>>>>>>> b4f25a5 (ajout du cooldown sur le scanf)
 }
 
 int main() {
@@ -85,16 +93,21 @@ int main() {
     int guessed_correctly = 0;
     char try[MAX_TRIES]; //save the carcater try
 
+    signal(SIGALRM,sig_handler);
+
     for (int i = 0; i < word_length; i++) {
         guessed[i] = '_';
     }
     guessed[word_length] = '\0';
 
     while (tries < MAX_TRIES && guessed_correctly < word_length) {
+
         printf("\nMot à deviner : %s\n", guessed);
         display_hangman(tries);
         char guess;
+        alarm(30);
         printf("Entrez une lettre : ");
+        alarm(30);
         scanf(" %c", &guess);