Nothing change
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	model/server.js
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	model/server.js
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	model/server.js
Ajout game.ejs pour test