add greeting with user name
fix merge conflicts
passing all specs
fix merge confilts