commit suicide
tout màj

Merge branch 'master' of https://github.com/Marthin-/lifegamecvl

Conflicts:
	projetC/main.c