trying to resolve from web

is it possible?
up to the pull request!
Merge remote-tracking branch 'shared/greet' into greet

Conflicts:
	README
Merge pull request #2 from axelcostaspena/greet

finally achieved!