second commit
Merge branch 'master' of https://github.com/dhkim83/WDI_Project2

merge