ajout attribut etage aux perso
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct
Nouvelles images
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	view/canvas.js