dday commit
D DAY MERGE
Merge pull request #30 from jpark1120/master

D DAY MERGE