diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php
index 223886a..0f98b15 100755
--- a/SRC/app/Http/Controllers/GameController.php
+++ b/SRC/app/Http/Controllers/GameController.php
@@ -97,7 +97,12 @@ class GameController extends Controller {
             default:
                 break;
         }
+<<<<<<< HEAD
         Response::make('records')->withCookie(Cookie::forever('trophee', $values));
+=======
+        
+        $response->withCookie(Cookie::forever('trophee', $values));
+>>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414
     }
 
 }
diff --git a/SRC/resources/views/frontend/games.blade.php b/SRC/resources/views/frontend/games.blade.php
index 680d7ed..c640490 100755
--- a/SRC/resources/views/frontend/games.blade.php
+++ b/SRC/resources/views/frontend/games.blade.php
@@ -23,8 +23,6 @@
             <img style="height:100px; vertical-align:middle;width:100px" src="{{ URL::to('imgs/trophees/or.png') }}"><br>
             {{$nbOr}}
         </div>
-
-
     </div>
 @endsection
 
diff --git a/SRC/resources/views/frontend/memo_level.blade.php b/SRC/resources/views/frontend/memo_level.blade.php
index d786daf..8140f90 100755
--- a/SRC/resources/views/frontend/memo_level.blade.php
+++ b/SRC/resources/views/frontend/memo_level.blade.php
@@ -5,8 +5,7 @@
 <div class="referents">
 <div class="referent game"
          onclick='location.href = "{{ URL::to('memo') }}";'
-         style="background:url('{{ URL::to('imgs/memo.jpg') }}'); width: 50%;">
-        <div class="infos">Mémo</div>
+         style="background:url('{{ URL::to('imgs/memo/memo2.png') }}');  background-repeat:no-repeat; background-size: contain; border: none; margin-top: 10%;">
     </div>
 
     <br>
diff --git a/SRC/resources/views/frontend/puzzle_level.blade.php b/SRC/resources/views/frontend/puzzle_level.blade.php
index 46eb5e0..1236663 100755
--- a/SRC/resources/views/frontend/puzzle_level.blade.php
+++ b/SRC/resources/views/frontend/puzzle_level.blade.php
@@ -5,10 +5,16 @@
 <div class="abso referents">
 <div class="game active"
          onclick='location.href = "{{ URL::to('puzzle') }}";'
-         style="background:url('{{ URL::to('imgs/puzzle/puzzle.png') }}'); width: 50%;">
+         style="background:url('{{ URL::to('imgs/puzzle/puzzle.png') }}'); background-repeat:no-repeat; background-size: contain; border: none; margin-top: 10%;">
     </div>
 <br>
-    <button class="level" onclick="location.href='{{ URL::to('puzzle/jouer/1') }}'"><span style="color:gold;"><span class="icon-star-full"></span></span><span class="icon-star-full"></span><span class="icon-star-full"></span></button>
+    <button class="level" onclick="location.href='{{ URL::to('puzzle/jouer/1') }}'">
+    	<span style="color:gold;">
+    		<span class="icon-star-full"></span>
+    	</span>
+    	<span class="icon-star-full"></span>
+    	<span class="icon-star-full"></span>
+    </button>