Its Okay....
Let Okey..... LookLike
DisappearBug
Merge remote-tracking branch 'origin/master' into TestToMergeAll2
FixTag
Merge branch 'master' into TestToMergeAll2

Conflicts:
	Assets/Textures/Item_01.png.meta
Merge branch 'TestToMergeAll2' of https://github.com/VincentSai/WhatDoYouSee into TestToMergeAll2
Merge branch 'TestToMergeAll2' into Merge-Bomb

Conflicts:
	Assets/Prefabs/Zombie.prefab
	Assets/Scenes/TestScene.unity
	Assets/Scripts/Gun.cs
Bomb
SoundManager
Merge
Merge branch 'Merge-Bomb' into Sounds

Conflicts:
	Assets/Scripts/Gun.cs
SoundController
Gun Effect
Merge branch 'Sounds'

Conflicts:
	Assets/Scripts/Food.cs
	Assets/Scripts/SoundManager.cs.meta