Tournoi - Evenement
Merge branch 'master' of https://github.com/sim590/smi1002-tp

Conflicts:
	src/TP_SMI1002/TP_SMI1002.csproj
Merge branch 'master' of https://github.com/sim590/smi1002-tp

Conflicts:
	src/TP_SMI1002/TP_SMI1002.csproj