patricks station
Merge branch 'master' of https://github.com/Undiscovered-Game-Studios/Project-Legacy-2D

Conflicts:
	Project Legacy 2D/Library/AssetServerCacheV3
	Project Legacy 2D/Library/CurrentLayout.dwlt
	Project Legacy 2D/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project Legacy 2D/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project Legacy 2D/Library/ScriptMapper
	Project Legacy 2D/Library/assetDatabase3
	Project Legacy 2D/Library/expandedItems
	Project Legacy 2D/Library/guidmapper
	Project Legacy 2D/Library/metadata/f4/f4be206b0c444414985a5e6b02172fe9
	Project Legacy 2D/Library/shadercompiler-1.log
	Project Legacy 2D/Project Legacy 2D-csharp.sln
	Project Legacy 2D/Project Legacy 2D.sln