nothing
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	MiniProjAntoineStephane/User.cs
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	MiniProjAntoineStephane/Program.cs
	MiniProjAntoineStephane/User.cs
Merge completing
Dictionary possibility
Q1 & Q2 FIX
Merge remote-tracking branch 'origin/Possible-with-diction' into develop

Conflicts:
	MiniProjAntoineStephane/Program.cs
	MiniProjAntoineStephane/User.cs