my push
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	manager/Personnage_Manager.js
	model/object/Personnage.js