Connect say-hello with greet-green
Fix conflict for say-hello
Merge remote-tracking branch 'upstream/master'

Conflicts:
	english/explore-outside/investigate-marshmallow-structure/say-hello/say-hello/say-hello.md
Merge pull request #51 from steamIngenius/micahs-changes

Connect say-hello with greet-green