est
Merge branch 'master' of
https://github.com/secu2/miage_projet_framework.git

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

Conflicts:
	src/systeme/rmi/MainRmi.java