ap"robation
Merge branch 'master' of github.com:CQuentin/QBomberMan
ajout approbation
Conflicts:
	Documents/rendu2/page_de_garde.odt