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

Conflicts:
	view/canvas.js
Commit presque useless