local commit 1
Noyau fonctionnel
commit
Merge remote-tracking branch 'origin/igor' into encoreEtEncoreFuckGit

Conflicts:
	test/src/main/Grid.java