asdasd
Yes

Merge branch 'master' of https://github.com/choiseungil29/DifBird

Conflicts:
	Horror/Library/assetDatabase3
Door / AIScene
SubEvent
Merge branch 'master' of git://github.com/pbes0707/DifBird into pbes0707

Conflicts:
	Horror/Assets/Game/AIScene/AIScene.unity
	Horror/Assets/Game/AIScene/Assets/AnigoProto_BackUp_nodoor.fbx.meta
	Horror/Assets/Game/AIScene/Scripts/Door.cs.meta
	Horror/Assets/Game/AIScene/Scripts/EventUpdate_1.cs
	Horror/Assets/Game/AIScene/Scripts/EventUpdate_1.cs.meta
	Horror/Assets/Game/AIScene/Scripts/EventUpdate_2.cs
	Horror/Assets/Game/AIScene/Scripts/EventUpdate_2.cs.meta
	Horror/Assets/Game/AIScene/Scripts/eventclass.cs
	Horror/Assets/Game/AIScene/Scripts/eventclass.cs.meta
	Horror/Assets/Game/GameScene/Door.cs.meta
	Horror/Assets/Game/GameScene/EventUpdate_1.cs
	Horror/Assets/Game/GameScene/EventUpdate_1.cs.meta
	Horror/Assets/Game/GameScene/EventUpdate_2.cs
	Horror/Assets/Game/GameScene/EventUpdate_2.cs.meta
	Horror/Assets/Game/GameScene/eventclass.cs
	Horror/Assets/Game/GameScene/eventclass.cs.meta
	Horror/Assets/Game/Materials/cman0014.mat
	Horror/Assets/Game/ShamScene/Door.cs
	Horror/Assets/Game/ShamScene/Door.cs.meta
	Horror/Assets/Game/ShamScene/EventUpdate_1.cs
	Horror/Assets/Game/ShamScene/EventUpdate_1.cs.meta
	Horror/Assets/Game/ShamScene/EventUpdate_2.cs
	Horror/Assets/Game/ShamScene/EventUpdate_2.cs.meta
	Horror/Assets/Game/ShamScene/eventclass.cs
	Horror/Assets/Game/ShamScene/eventclass.cs.meta
	Horror/Assets/splatterLevel.unity
	Horror/Library/AssetServerCacheV3
	Horror/Library/InspectorExpandedItems.asset
	Horror/Library/assetDatabase3
	Horror/Library/expandedItems
	Horror/Library/guidmapper
Mia
 - remove garbage files