test commits simultanés
Merge branch 'master' of https://github.com/jlbananes/ProjetFinalMaths

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/jlbananes/ProjetFinalMaths.git

Conflicts:
	main.cpp