kk
tMerge branch 'master' of https://github.com/maxnicpie/projetpoo.git

Conflicts:
	ProjetPOO/src/Critere.java
	ProjetPOO/src/DocumentCreation.java