Merge pull request #1 from ruinra/master

merge 이렇게 하는 것 맞나요?? -나영
commit kny
commit&push kny
Merge pull request #7 from flowerny/master

kny