commentaires
Merge branch 'master' of https://github.com/xaron17/Projet-algo

Conflicts:
	Chapitre.java
Merge branch 'master' of https://github.com/xaron17/Projet-algo