Bouton pour test messages acquittement
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	view/canvas.js
Commit before pull & coding night
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct