j'ai commit
Merge branch 'master' of github.com:antoin-m/corewar

Conflicts:
	asm/live.c
Merge branch 'master' of github.com:antoin-m/corewar
Merge branch 'master' of github.com:antoin-m/corewar
coucou