Auto stash before merge of "master" and "origin/master"

assets/css/style.css

@@ -1,3 +1,8 @@
+@font-face{
+    font-family: 'Mario Kart';
+    src: url('../fonts/Mario-Kart-DS.ttf');
+}
+
 body{
     margin: 0;
     padding: 0;
@@ -51,6 +56,18 @@ body{
     animation: cibleBroken 0.3s 3;
 }
 
+<<<<<<< Updated upstream
+=======
+.cible{
+    background: url(../img/bg_cible.png) no-repeat;
+}
+
+.cible-touchee{
+    background: url(../img/bg_cible_broken.png) no-repeat;
+    animation: cibleBroken 0.3s 3;
+}
+
+>>>>>>> Stashed changes
 @keyframes cibleBroken{
     0%{
         opacity: 1;

assets/js/script.js

@@ -107,6 +107,7 @@ function move(event) {
     }
 }
 
+<<<<<<< Updated upstream
 setInterval(function(){
     console.log('test');
     if(bulletX == 0 || bulletY == 0){
@@ -166,6 +167,9 @@ setInterval(function(){
     grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat';
     grid.style.backgroundPosition = bulletDir;
 }, 32.12);
+=======
+document.addEventListener('keydown', move, false);
+>>>>>>> Stashed changes
 
 setInterval(function(){ 
     x2 = Math.floor(Math.random() * 11);
@@ -180,7 +184,13 @@ setInterval(function(){
         cibley = y2,
         emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley);
     emplacement.classList.add('cible');
+<<<<<<< Updated upstream
 }, 3000);
 
 document.addEventListener('keydown', move, false);
-setPosition(x, y, direction);
+setPosition(x, y, direction);
+=======
+
+
+}, 3000);
+>>>>>>> Stashed changes

index.html

@@ -203,7 +203,7 @@
                 <div class="col col-7"></div>
                 <div class="col col-8"></div>
                 <div class="col col-9"></div>
-                <div class="col col-10"></div>
+                <div class="col col-10 cible-touchee"></div>
                 <div class="col col-11"></div>
                 <div class="col col-12"></div>
                 <div class="col col-13"></div>