Ajout de classes / Modification de classes
Effacement de fichiers
Merge branch 'master' of https://github.com/Poneymove/testWithGit.git

Conflicts:
	TestWithGit/bin/Barre.class
	TestWithGit/bin/ressources/require/Require
Slick/LWJGL/native/macosx/liblwjgl.jnilib
	TestWithGit/src/ressources/require/Require
Slick/LWJGL/native/macosx/liblwjgl.jnilib