modified:   obj/decodage.o
	modified:   projet_etoile
	modified:   src/decodage.c
Merge branch 'master' of https://github.com/pfmonville/Projet_etoile

commit simple