'jajoutedesconneries'
Merge branch 'test'
Merge branch 'master' of github.com:tonito0811/game_nodejs_project

Conflicts:
	server.js