commit pour pull
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	view/game.ejs