oscar toucched my laptop
Merge branch 'Oscar' of https://github.com/jrsescon/AffectDDATopDown into Oscar

Conflicts:
	Assembly-CSharp.pidb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper