modif

Signed-off-by: Slivw <42sliv@gmail.com>
Merge branch 'master' of https://github.com/Slivw/CraftBukkit

Conflicts:
	src/Nouveau document texte.txt

Signed-off-by: Slivw <42sliv@gmail.com>