Bonjour
salut
Merge branch 'master' of github.com:AdelePicard/ProjetS4

Conflicts:
	test.c