firstCommitMathieu
First commit
Adding Main menu
Adding Play menu
re
test
Tous les assets de jeu sauf la ligne de but
Amélioration d'affichage de la scène et de la balle
no message
currentLayout librairie dafuk
Merge remote-tracking branch 'origin/Fred' into Mathieu

Conflicts:
	StratBrawl_source/Library/AssetServerCacheV3
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/expandedItems
	StratBrawl_source/Library/guidmapper
Merge branch 'Maxime'

Conflicts:
	StratBrawl_source/Assets/Scripts/Menu.meta
	StratBrawl_source/Library/AssetServerCacheV3
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/guidmapper
Merge commit 'e8fc597765c3b5f39a9f68092a15df5f13ef9d63'

Conflicts:
	StratBrawl_source/Assembly-CSharp-vs.csproj
	StratBrawl_source/Assembly-CSharp.csproj
	StratBrawl_source/Assets/Scenes/Menu.unity
	StratBrawl_source/Library/AssetServerCacheV3
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/InspectorExpandedItems.asset
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	StratBrawl_source/Library/ScriptMapper
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/expandedItems
	StratBrawl_source/Library/guidmapper
	StratBrawl_source/Library/metadata/00/00000000000000002000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000003000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000004000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000004100000000000000
	StratBrawl_source/Library/metadata/00/00000000000000005000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000005100000000000000
	StratBrawl_source/Library/metadata/00/00000000000000006000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000006100000000000000
	StratBrawl_source/Library/metadata/00/00000000000000007000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000008000000000000000
	StratBrawl_source/Library/metadata/00/00000000000000009000000000000000
	StratBrawl_source/Library/metadata/00/0000000000000000a000000000000000
	StratBrawl_source/Library/metadata/00/0000000000000000b000000000000000
	StratBrawl_source/Library/metadata/00/0000000000000000c000000000000000
	StratBrawl_source/Library/metadata/14/1449e4a6baefdf84590e08b4bc12b2a3
	StratBrawl_source/Library/metadata/16/16976926a0b546f4da6c19b7a7268670
	StratBrawl_source/Library/metadata/3e/3eadf2154e408a54e92664affe2d36da
	StratBrawl_source/Library/metadata/74/74a67dc67a7e559498254ce4387d9fd9
	StratBrawl_source/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
	StratBrawl_source/Library/metadata/9d/9d97a636a13f36e45b97af845556c21c
	StratBrawl_source/Library/metadata/d9/d9fcdc8e37ed2974e95adf34bbda0526
	StratBrawl_source/Library/metadata/e7/e7b4763730dc5ce47aa770f0de46dd9c
	StratBrawl_source/Library/metadata/ec/ec5420dfaeae4ba4ab90c4dd713ecadd
	StratBrawl_source/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8
	StratBrawl_source/StratBrawl_source-csharp.sln
	StratBrawl_source/StratBrawl_source.sln
	StratBrawl_source/StratBrawl_source.userprefs