diff --git a/Conception/Class diagram/Class Diagram.png b/Conception/Class diagram/Class Diagram.png
deleted file mode 100644
index 05f4c90..0000000
Binary files a/Conception/Class diagram/Class Diagram.png and /dev/null differ
diff --git a/Conception/Class diagram/MVC Class Diagram.png b/Conception/Class diagram/MVC Class Diagram.png
deleted file mode 100644
index 8574b14..0000000
Binary files a/Conception/Class diagram/MVC Class Diagram.png and /dev/null differ
diff --git a/Conception/Class diagram/V1/MVC Class Diagram-2.png b/Conception/Class diagram/V1/MVC Class Diagram-2.png
new file mode 100644
index 0000000..cb7173e
Binary files /dev/null and b/Conception/Class diagram/V1/MVC Class Diagram-2.png differ
diff --git a/Conception/Class diagram/Version_Finale/Controller.png b/Conception/Class diagram/Version_Finale/Controller.png
new file mode 100644
index 0000000..1459a30
Binary files /dev/null and b/Conception/Class diagram/Version_Finale/Controller.png differ
diff --git a/Conception/Class diagram/Version_Finale/Model.png b/Conception/Class diagram/Version_Finale/Model.png
new file mode 100644
index 0000000..889c91c
Binary files /dev/null and b/Conception/Class diagram/Version_Finale/Model.png differ
diff --git a/Conception/Class diagram/Version_Finale/Protocol.png b/Conception/Class diagram/Version_Finale/Protocol.png
new file mode 100644
index 0000000..421bd17
Binary files /dev/null and b/Conception/Class diagram/Version_Finale/Protocol.png differ
diff --git a/Conception/Class diagram/Version_Finale/View.png b/Conception/Class diagram/Version_Finale/View.png
new file mode 100644
index 0000000..27f1091
Binary files /dev/null and b/Conception/Class diagram/Version_Finale/View.png differ
diff --git a/Conception/Composite Structure Diagram/Diagram Structure Composite .png b/Conception/Composite Structure Diagram/Diagram Structure Composite .png
index 399fd66..76033e9 100644
Binary files a/Conception/Composite Structure Diagram/Diagram Structure Composite .png and b/Conception/Composite Structure Diagram/Diagram Structure Composite .png differ
diff --git a/Conception/Sequence diagram/ Session de clavardage .png b/Conception/Sequence diagram/ Session de clavardage .png
new file mode 100644
index 0000000..8c94526
Binary files /dev/null and b/Conception/Sequence diagram/ Session de clavardage .png differ
diff --git a/Conception/Sequence diagram/Déconnexion.png b/Conception/Sequence diagram/Déconnexion.png
index 521052b..3964cbe 100644
Binary files a/Conception/Sequence diagram/Déconnexion.png and b/Conception/Sequence diagram/Déconnexion.png differ
diff --git a/Conception/Sequence diagram/Main.png b/Conception/Sequence diagram/Main.png
index 7ae9cd6..9b5918b 100644
Binary files a/Conception/Sequence diagram/Main.png and b/Conception/Sequence diagram/Main.png differ
diff --git a/Conception/Sequence diagram/Modification Pseudonyme.png b/Conception/Sequence diagram/Modification Pseudonyme.png
index 32c7666..c32e0ac 100644
Binary files a/Conception/Sequence diagram/Modification Pseudonyme.png and b/Conception/Sequence diagram/Modification Pseudonyme.png differ
diff --git a/Conception/Sequence diagram/Réduction de l'agent.png b/Conception/Sequence diagram/Réduction de l'agent.png
index e6ea337..7309a2c 100644
Binary files a/Conception/Sequence diagram/Réduction de l'agent.png and b/Conception/Sequence diagram/Réduction de l'agent.png differ
diff --git a/Conception/Sequence diagram/Session de clavardage .png b/Conception/Sequence diagram/Session de clavardage .png
deleted file mode 100644
index e9cd142..0000000
Binary files a/Conception/Sequence diagram/Session de clavardage .png and /dev/null differ
diff --git a/Conception/State Machine Diagram/Clavardage_UtilisateursActifs.png b/Conception/State Machine Diagram/Clavardage_UtilisateursActifs.png
new file mode 100644
index 0000000..7c3765f
Binary files /dev/null and b/Conception/State Machine Diagram/Clavardage_UtilisateursActifs.png differ
diff --git a/Conception/State Machine Diagram/Machine a etat Chatapp.png b/Conception/State Machine Diagram/Machine a etat Chatapp.png
deleted file mode 100644
index 53b2a2d..0000000
Binary files a/Conception/State Machine Diagram/Machine a etat Chatapp.png and /dev/null differ
diff --git a/Conception/State Machine Diagram/Main.png b/Conception/State Machine Diagram/Main.png
new file mode 100644
index 0000000..af88931
Binary files /dev/null and b/Conception/State Machine Diagram/Main.png differ
diff --git a/Conception/State Machine Diagram/Pseudo.png b/Conception/State Machine Diagram/Pseudo.png
new file mode 100644
index 0000000..a82631b
Binary files /dev/null and b/Conception/State Machine Diagram/Pseudo.png differ
diff --git a/Conception/State Machine Diagram/Reduction_agent.png b/Conception/State Machine Diagram/Reduction_agent.png
new file mode 100644
index 0000000..6ace32a
Binary files /dev/null and b/Conception/State Machine Diagram/Reduction_agent.png differ
diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
index 3dd9acb..84e07d3 100644
--- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
+++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,41 +1,40 @@
-chatapp/Model/Utilisateur.java
- chatapp.Model.Utilisateur
-chatapp/Launcher.java
- chatapp.Launcher
-chatapp/Model/MessageHorodate.java
- chatapp.Model.MessageHorodate
-chatapp/Model/DataBase.java
- chatapp.Model.DataBase
-chatapp/Model/ListUtilisateurs.java
- chatapp.Model.ListUtilisateurs
-chatapp/Protocol/SessionClavardage.java
- chatapp.Protocol.SessionClavardage
-chatapp/Protocol/HttpEchange.java
- chatapp.Protocol.HttpEchange
-chatapp/View/View_Menu.java
- chatapp.View.View_Menu
-chatapp/View/ChangementPseudo.java
- chatapp.View.ChangementPseudo
-chatapp/Protocol/RunnerEcouteUDP.java
- chatapp.Protocol.RunnerEcouteUDP
-chatapp/Protocol/UDPEchange.java
- chatapp.Protocol.RunnerUDP
- chatapp.Protocol.UDPEchange
-chatapp/Main.java
- chatapp.Main
-chatapp/View/View_Utilisateurs.java
- chatapp.View.View_Utilisateurs
-chatapp/View/ConnexionScreen.java
- chatapp.View.ConnexionScreen
 chatapp/Protocol/RunnerEcouteTCP.java
  chatapp.Protocol.RunnerEcouteTCP
 chatapp/View/FenetreSession.java
  chatapp.View.FenetreSession
- chatapp.View.FenetreSession$1
 chatapp/Controller/ChatApp.java
  chatapp.Controller.ChatApp
+chatapp/Model/DataBase.java
+ chatapp.Model.DataBase
+chatapp/View/ChangementPseudo.java
+ chatapp.View.ChangementPseudo
+chatapp/Protocol/RunnerEcouteUDP.java
+ chatapp.Protocol.RunnerEcouteUDP
+chatapp/Launcher.java
+ chatapp.Launcher
+chatapp/Model/ListUtilisateurs.java
+ chatapp.Model.ListUtilisateurs
+chatapp/Protocol/UDPEchange.java
+ chatapp.Protocol.RunnerUDP
+ chatapp.Protocol.UDPEchange
+chatapp/Model/MessageHorodate.java
+ chatapp.Model.MessageHorodate
+chatapp/Main.java
+ chatapp.Main
 chatapp/View/Clavardage.java
  chatapp.View.Clavardage
  chatapp.View.Clavardage$1
+chatapp/Protocol/SessionClavardage.java
+ chatapp.Protocol.SessionClavardage
+chatapp/View/ConnexionScreen.java
+ chatapp.View.ConnexionScreen
+chatapp/View/View_Utilisateurs.java
+ chatapp.View.View_Utilisateurs
+chatapp/Model/Utilisateur.java
+ chatapp.Model.Utilisateur
+chatapp/View/View_Menu.java
+ chatapp.View.View_Menu
+chatapp/Protocol/HttpEchange.java
+ chatapp.Protocol.HttpEchange
 chatapp/View/DemarrerSession.java
  chatapp.View.DemarrerSession
diff --git a/README.md b/README.md
index c6b4cb7..4d13b72 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,25 @@ Nous avons quatre package distincts regroupant nos différentes classes. <br>
     </ul>
 </p>
 
-## Javadoc 
+## Javadoc
 <p>
     Des commentaires étant présents dans le code source de notre application, nous avons généré la documentation dans ce dossier.
 </p>
 
+## Rapport
+<p>
+  Dossier comprenant deux rapports :
+  <ul>
+      <li> Le rapport de la conception avec des explications des différents diagrammes.</li>
+      <li> Le rapport de l'implémentation avec des explications sur le code et l'utilisation de l'application.</li>
+  </ul>
+</p>
+
+## Server de présence
+<p>
+  Le code du server de présence, celui-ci faisant office de proxy.
+</p>
+
 ## Techologies Utilisées
 <p>
     <ul>