journal final progres
Merge branch 'master' of https://github.com/JulesGagnonMarchand/ProjetReseau

Conflicts:
	ProjetINF3405/Client/main.cpp