Metadata and trees.
Have no fucking clue

Merge branch 'master' of https://github.com/PRosset/LudumDare

Conflicts:
	LudumDare/Library/CurrentLayout.dwlt
	LudumDare/Library/InspectorExpandedItems.asset
	LudumDare/Library/assetDatabase3
	LudumDare/Library/expandedItems
	LudumDare/Library/guidmapper
	LudumDare/Library/metadata/a8/a86c36bfd69136f46b14a9d17180a8db
	LudumDare/Library/metadata/c0/c04417b8b2635cf42b19afb9afeb6b33
	LudumDare/Library/metadata/f6/f6de93a0786213b4eb779168b73f0d55
	LudumDare/LudumDare-csharp.sln
	LudumDare/LudumDare.sln
Again no clue...

Merge branch 'master' of https://github.com/PRosset/LudumDare

Conflicts:
	LudumDare/Assets/Prefabs/CharacterManager.prefab
	LudumDare/Assets/Scenes/GameplaySetup_06.unity
	LudumDare/Library/CurrentLayout.dwlt
	LudumDare/Library/InspectorExpandedItems.asset
	LudumDare/Library/assetDatabase3
	LudumDare/Library/expandedItems
	LudumDare/LudumDare-csharp.sln
	LudumDare/LudumDare.sln