added greeting message
Merge branch 'feature3'