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

Conflicts:
	public/bootstrap/css/bootstrap.css
	public/bootstrap/css/bootstrap.min.css
	public/images/Thumbs.db
	view/accueil.ejs
	view/chat.ejs
	view/classement.ejs
	view/game.ejs
	view/regles.ejs
	view/tutoriel.ejs
commit for site
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct