need  for commit;
need for commit 2;
Merge branch 'master' of https://github.com/Ouisticram/projetIHM

Conflicts:
	projetIHM/bin/model/Carnet.class
	projetIHM/jar/projetIHM.jar