connexion au jeu
connextion
Merge branch 'master' of https://github.com/SuperCorks/LOG320_Lab3.git

Conflicts:
	Lab3/src/main/mainClass.java