test
test
test
Merge branch 'master' of https://github.com/Khaaao/Enclos.git

Conflicts:
	Enclos/src/Champ.java