cest beau
Merge branch 'Bip' of https://github.com/GLO-2004/TravailSession into Bip

Conflicts:
	src/root/View/Grid.java