Test mis en com
Merge branch 'master' of https://github.com/dandy-kun/projet.git

Conflicts:
	src/main/java/com/projet/model/manager/impl/ProjetManagerImpl.java