ClientRequestManager
Merge branch 'master' of https://github.com/legouxg/projet_car

Conflicts:
	server/src/server/Server.java