day1020 - merge
day1020 modify conflict
Merge pull request #41 from KimMinJeong/ksk_branch

Ksk branch