Site v2
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	public/images/Thumbs.db
	public/map/Thumbs.db
	view/classement.ejs
	view/game.ejs
commit page v2
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	public/map/Thumbs.db
	view/canvas.js