add comments possible
modify conflict
Merge pull request #23 from KimMinJeong/KMJ

Kmj