changed the message used for greeting
merging file with updated master version