combine two welcome lines into one
Merge branch 'master' of https://github.com/hayleejung/hello