hh
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/systeme/Serveur.java
haaaaaaaaaaaa
Merge branch 'master' of
https://github.com/secu2/miage_projet_framework.git

Conflicts:
	src/systeme/Serveur.java
	src/systeme/rmi/MainRmi.java
bordel
Merge branch 'master' of
https://github.com/secu2/miage_projet_framework.git

Conflicts:
	src/systeme/rmi/ClientRMI.java