Partie client 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/systeme/rmi/ClientRMI.java
	src/systeme/rmi/ServeurRMI.java
Merge branch 'master' of https://github.com/secu2/miage_projet_framework.git
send et receive
Merge branch 'master' of https://github.com/secu2/miage_projet_framework.git
Systeme Rmi partie 3
Merge branch 'master' of
https://github.com/secu2/miage_projet_framework.git