added a new greeting
Merge remote-tracking branch 'origin/master'