Connect say-hello with greet-green
Add basement-swim page linked from  eating-chocolate page
Remove blank lines from eating-chocolate.md and basement-swim.md
Merge pull request #56 from brettpilch/sleep-dream

Add basement-swim page linked from  eating-chocolate page
Added option to fish
Create option in sail.md and dir for shore.md
Merge pull request #60 from tswei/waterfall

Create option in sail.md and dir for shore.md
Remove link-less text
Add option staypuft in marshmallow
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 #58 from abustamam/stream

Added option to fish
Merge pull request #62 from Johny-C/mychanges

Add option staypuft in marshmallow
Merge pull request #51 from steamIngenius/micahs-changes

Connect say-hello with greet-green