modify 2
Merge branch 'master' of https://github.com/lrd15/hello-world

merge 1 and 2