ta maman
Merge branch 'master' of https://github.com/cruchaue/Miage_Share.git

Conflicts:
	MIAGE_SHARE/src/share/g2/miage/server/Server.java
ests
Merge branch 'master' of https://github.com/cruchaue/Miage_Share.git