method save solve conflicts
Merge branch 'master' of https://github.com/BenoitHugonnard/ProjetGL

Conflicts:
	src/main/java/fr/ensai/projet/client/MethodSave.java