Cleanup
Merge branch 'master' of https://github.com/jklre/teabagnorthkorea

Conflicts:
	New2dproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	New2dproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New2dproject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	New2dproject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	New2dproject/Library/assetDatabase3