Commit Chats + Heure
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	app.js
	public/Boutons/Thumbs.db
	public/Thumbs.db
	public/images/Thumbs.db
	public/map/Thumbs.db
	view/game.ejs