no more conflict... (3)
Merge branch 'JuHyeng' into platforms

Conflicts:
	.gitignore
	Assets/prefab/Player.prefab
	Assets/prefab/Player.prefab.meta
	Assets/prefab/deadScene/dead_hole.prefab
	Assets/prefab/reinforced.prefab
	Assets/prefab/reinforced.prefab.meta
	Assets/prefab/wood.prefab
	Assets/prefab/wood.prefab.meta
	Assets/scene/inGame.unity
	Assets/script/SpriteControl.cs
	Assets/sprite/effect.meta
	Assets/sprite/effect/blood.psd.meta
	Assets/sprite/sample.psd.meta
	Falling-csharp.sln
	Falling.sln
background prefebs merge를 위한 커밋
Merge branch 'JuHyeng' into platforms

Conflicts:
	Falling-csharp.sln
	Falling-csharp.v11.suo
	Falling.sln
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/3e/3e8de657a2bfcd745a93a29ebcf79538
	Library/metadata/c5/c5e53127516bf7f478001ca907df4e45
master에 push하기 위한 commit
master에 push하기 위한 commit