version1
Merge branch 'master' of ssh://git@github.com/bilgenm/ProjetGroupe5.git

Conflicts:
	.classpath
Merge branch 'master' of ssh://git@github.com/bilgenm/ProjetGroupe5.git
essai2