Moved Tool to its own package
Fixed merge
Merge branch 'master' of https://github.com/r0ck5tar/DeVINT

Conflicts:
	Modele_de_jeu/src/fonctionnement/objet/Joueur.java