commit propre
reCommit
RE RE commit =)
ajustement des menus
corrections commit
Merge remote-tracking branch 'origin/master' into Teams

Conflicts:
	.gitignore
	firemen warriors/.gitignore
	firemen warriors/Assembly-CSharp-vs.csproj
	firemen warriors/Assembly-CSharp.csproj
	firemen warriors/Assets/MainMenuScene.unity
	firemen warriors/Assets/MainScene.unity
	firemen warriors/Assets/Models.meta
	firemen warriors/Assets/Models/Materials.meta
	firemen warriors/Assets/Models/Materials/12 - Default.mat.meta
	firemen warriors/Assets/Models/Materials/13 - Default.mat.meta
	firemen warriors/Assets/Models/Materials/No Name.mat.meta
	firemen warriors/Assets/Models/bomb.max.meta
	firemen warriors/Assets/Models/mine.max.meta
	firemen warriors/Assets/Models/piege.max.meta
	firemen warriors/Assets/Scripts/DeplacementScript.cs.meta
	firemen warriors/Builds/Client_Data/Managed/Assembly-CSharp.dll
	firemen warriors/Builds/Client_Data/Managed/Assembly-CSharp.dll.mdb
	firemen warriors/Builds/Client_Data/PlayerConnectionConfigFile
	firemen warriors/Builds/Client_Data/level0
	firemen warriors/Builds/Client_Data/mainData
	firemen warriors/Builds/Client_Data/output_log.txt
	firemen warriors/Builds/Client_Data/sharedassets0.assets
	firemen warriors/Builds/Client_Data/sharedassets1.assets
	firemen warriors/Builds/Server_Data/Managed/Assembly-CSharp.dll
	firemen warriors/Builds/Server_Data/Managed/Assembly-CSharp.dll.mdb
	firemen warriors/Builds/Server_Data/PlayerConnectionConfigFile
	firemen warriors/Builds/Server_Data/level0
	firemen warriors/Builds/Server_Data/mainData
	firemen warriors/Builds/Server_Data/output_log.txt
	firemen warriors/Builds/Server_Data/sharedassets0.assets
	firemen warriors/Builds/Server_Data/sharedassets1.assets
	firemen warriors/Library/CurrentLayout.dwlt
	firemen warriors/Library/EditorUserBuildSettings.asset
	firemen warriors/Library/InspectorExpandedItems.asset
	firemen warriors/Library/ScriptAssemblies/Assembly-CSharp.dll
	firemen warriors/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	firemen warriors/Library/assetDatabase3
	firemen warriors/Library/expandedItems
	firemen warriors/Library/guidmapper
	firemen warriors/Library/metadata/0a/0a4d0b3ba29b9554e9aded19c05d888d
	firemen warriors/Library/metadata/17/1705b1454bb87e44a879743df0815fb8
	firemen warriors/Library/metadata/41/417460bb2dc3bdc4f86c19a9106eb959
	firemen warriors/Library/metadata/aa/aab1cf2379c519b45986a75f9288b1b5
	firemen warriors/Library/metadata/ae/ae012c041f6692a449c9c36abc2bb196
	firemen warriors/Library/metadata/ce/ce92deb70533dce40b743a6e53a5431b
	firemen warriors/Library/metadata/ea/ea04c7ce4e58add47a7b680f16aad225
	firemen warriors/Library/metadata/fa/faff1dba356819a4a8199d48f457493d
	firemen warriors/firemen warriors-csharp.sln
	firemen warriors/firemen warriors.sln
	firemen warriors/firemen warriors.userprefs