diff --git a/.bash_history b/.bash_history
index 97e5aff..6498702 100755
--- a/.bash_history
+++ b/.bash_history
@@ -385,3 +385,31 @@ git pull
exit
git pull
exit
+ls
+cd ..
+ls
+nano loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+cd ModuleWeb/
+ls
+nano SRC/init/loadCSVAugust2014.py
+git commit -a
+git pull
+git push
+nano SRC/public/js/ListeOeuvre.js
+git pull
+git pull
+gir pull
+git pull
+git pull
+git pull
+exit
+git pull
+exit
+git pull
+git pull
+exit
+git pull
+exit
+git pull
+exit
diff --git a/.composer/cache/files/laravel/framework/43637b796f1ac0b1a960984231251ff04b438006.zip b/.composer/cache/files/laravel/framework/43637b796f1ac0b1a960984231251ff04b438006.zip
new file mode 100644
index 0000000..9989f08
Binary files /dev/null and b/.composer/cache/files/laravel/framework/43637b796f1ac0b1a960984231251ff04b438006.zip differ
diff --git a/.composer/cache/files/psy/psysh/2ce0e8f3020fd292c2ad2a496c5d83939823f642.zip b/.composer/cache/files/psy/psysh/2ce0e8f3020fd292c2ad2a496c5d83939823f642.zip
new file mode 100644
index 0000000..c4edc06
Binary files /dev/null and b/.composer/cache/files/psy/psysh/2ce0e8f3020fd292c2ad2a496c5d83939823f642.zip differ
diff --git a/SRC/public/css/game.css b/SRC/public/css/game.css
index 2b128e3..45805af 100755
--- a/SRC/public/css/game.css
+++ b/SRC/public/css/game.css
@@ -5,14 +5,9 @@ body
background-repeat:no-repeat;
background-position:100% 100%;
background-size:cover;
-<<<<<<< HEAD
}
-=======
-}
-
.iconGame
{
- width: 13%;
- height: 23%;
+ width: 10%;
+ height: 20%;
}
->>>>>>> 407a955444da6207f59c5f05d283275510b2169c
diff --git a/SRC/resources/views/referent_games.blade.php b/SRC/resources/views/referent_games.blade.php
index f6f2f83..391a759 100755
--- a/SRC/resources/views/referent_games.blade.php
+++ b/SRC/resources/views/referent_games.blade.php
@@ -1,12 +1,9 @@
@extends('app')
-
-Games
-
-
-
-
+
+ 
+