Changements, mais refonte derriere donc on s'en tape
Merge branch 'master' of github.com:ArnaudXXIX/banana

Conflicts:
	maps/arena
Merge branch 'master' of github.com:ArnaudXXIX/banana
Merge branch 'master' of github.com:ArnaudXXIX/banana
Ajout de commentaires, changement des noms de variable