one
Merge branch 'master' of http://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	view/accueil.ejs
	view/admin.ejs
	view/chat-equipe.ejs
	view/chat.ejs
	view/classement.ejs
	view/game.ejs
Merge branch 'master' of http://github.com/MainMain/Ei4_Proj3ct