droit
test
Merge branch 'master' of https://github.com/cruchaue/Miage_Share.git

Conflicts:
	MIAGE_SHARE/src/ipConfig.properties
	MIAGE_SHARE/src/share/g2/miage/connectionServer/Server.java