Ammeublement
Merge branch 'master' of https://github.com/Choubs/IN-Troduction-Game

Conflicts:
	IN Troduction/Assets/Scenes/Coop.unity
	IN Troduction/Library/CurrentLayout.dwlt
	IN Troduction/Library/CurrentMaximizeLayout.dwlt
	IN Troduction/Library/InspectorExpandedItems.asset
	IN Troduction/Library/assetDatabase3
	IN Troduction/Library/expandedItems
	IN Troduction/Library/guidmapper
	IN Troduction/Library/metadata/46/46fbb59fa1f65934ab887a66eff16f83