add Greeting
Merge branch 'dev'