Merge pull request #6 from kms2413/master

이거보세여
20141202
Merge pull request #1 from ruinra/master

sorry but i love you