après résolution du conflit

Merge branch 'master' of https://github.com/Smarco10/LO23_TEST

Conflicts:
	test.c
Merge branch 'master' of github.com:Smarco10/LO23_TEST
motifier ce fichier
Merge branch 'master' of https://github.com/Smarco10/LO23_TEST
dfdfdfdfd
Merge branch 'master' of github.com:Smarco10/LO23_TEST
test
Merge branch 'master' of github.com:Smarco10/LO23_TEST
Merge branch 'master' of https://github.com/Smarco10/LO23_TEST
Merge branch 'master' of github.com:Smarco10/LO23_TEST
Ajout laeti.c
ajout de l'ajout de branches dans git_commande
maj de git_commande
Merge branch 'master' of https://github.com/Smarco10/LO23_TEST into celine

Conflicts:
	celine.c