diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml
index f4221e4..af6cce8 100644
--- a/.idea/HegreEtConfort.iml
+++ b/.idea/HegreEtConfort.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="App\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index c1906c3..c17c05a 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="33b4fc0c-d17b-4c8e-a258-c5d5ef128e8a">
+<<<<<<< HEAD
+    <data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="7dfccb0e-433e-4f42-b6ce-6362f7e2187a">
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
       <jdbc-url>jdbc:postgresql://172.20.96.1:5432/HegreEtConfort</jdbc-url>
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+    <data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153">
+=======
+<<<<<<< HEAD
+    <data-source source="LOCAL" name="@172.20.96.1" uuid="76621fd2-6622-4f8e-a632-d7b7602e0afe">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://172.20.96.1:5432/</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="hegreconfort@127.0.0.1" uuid="a0219ca4-02a7-456a-bf02-9b3234ed346b">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://127.0.0.1:3306/hegreconfort</jdbc-url>
+=======
+    <data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="6554e332-842b-41d7-a021-08782c7b72bb">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="chauffageproj@172.20.96.1 [2]" uuid="a446f2ca-1dfc-459a-97f5-eda71fd74aa2">
+>>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
+>>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f
+=======
+    <data-source source="LOCAL" name="HegreConfort@localhost" uuid="755cf5bd-875b-416d-8bc2-76a5b9ba2d4d">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3306/HegreConfort</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="database.introspection.mysql.dbe5060" value="true" />
+      </jdbc-additional-properties>
+>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
+>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
diff --git a/assets/styles/css/app.css b/assets/styles/css/app.css
index dd6181a..de8f662 100644
--- a/assets/styles/css/app.css
+++ b/assets/styles/css/app.css
@@ -1,3 +1,3 @@
 body {
-    background-color: skyblue;
+    background: url("../image/fond.png") center center / cover no-repeat !important;
 }
diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css
index 3acf4b0..851c8d8 100644
--- a/assets/styles/css/login.css
+++ b/assets/styles/css/login.css
@@ -82,6 +82,5 @@ body {
     width: 30%;
     height: 75%;
 
-
     background: #243C40;
 }
\ No newline at end of file
diff --git a/templates/authentication/index.html.twig b/templates/authentication/index.html.twig
deleted file mode 100644
index c40b41a..0000000
--- a/templates/authentication/index.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-{% block title %}Log in!{% endblock %}
-
-{% block body %}
-    <form method="post">
-        {% if error %}
-            <div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
-        {% endif %}
-
-        {% if app.user %}
-            <div class="mb-3">
-                You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a>
-            </div>
-        {% endif %}
-
-        <h1 class="h3 mb-3 font-weight-normal">Please sign in</h1>
-        <label for="username">Email</label>
-        <input type="email" value="{{ last_username }}" name="_username" id="username" class="form-control" autocomplete="email" required autofocus>
-        <label for="password">Password</label>
-        <input type="password" name="_password" id="password" class="form-control" autocomplete="current-password" required>
-
-        <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}">
-
-        <div class="checkbox mb-3">
-            <input type="checkbox" name="_remember_me" id="_remember_me">
-            <label for="_remember_me">Remember me</label>
-        </div>
-
-
-        <button class="btn btn-lg btn-primary" type="submit">
-            Sign in
-        </button>
-    </form>
-{% endblock %}
\ No newline at end of file