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
Merge branch 'master' of github.com:Smarco10/LO23_TEST
test
Merge branch 'master' of github.com:Smarco10/LO23_TEST
Merge branch 'master' of github.com:Smarco10/LO23_TEST