Marching square modif -> OK
Merge branch 'master' of https://github.com/nicko466/VM-Projet

Conflicts:
	imagesResult/image1.png