Commit before pull
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct
Commit before push
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	manager/Personnage_Manager.js
à tester : fct attaquer. à finir : fct utiliser