ajustement
Merge branch 'master' of https://github.com/DevoirMath/LaboMath

Conflicts:
	.gitignore