인우형것과 합체 완 14/06/02

버그가 약간있다..
Revert "인우형것과 합체 완 14/06/02"

This reverts commit 096cdc09294b943ddfb57c5daa3eab3f6d5552ba.
Merge branch 'master' of https://github.com/zlawodls/KirbyProject