Tentative de merge :p
Merge branch 'master' of https://github.com/Vineuvall/projet3_groupe8_lsinf1121.git
Merge branch 'master' of https://github.com/Vineuvall/projet3_groupe8_lsinf1121.git
qsd
Merge branch 'master' of
https://github.com/Vineuvall/projet3_groupe8_lsinf1121.git

Conflicts:
	Projet3/src/main/Test.java