Merge pull request #1 from ruinra/master

homework1
숙제끝
다시 끝
Merge pull request #6 from kentaziro/master

숙제끝