Add new main story option for jello salad
Fix typos in original files
Minor updates to the story
Make minor update to story locally
Merge branch 'master' of https://github.com/udacity/create-your-own-adventure into marshmallow-jello-o-salad

Conflicts:
	english/marshmallow.md
Merge pull request #236 from mdigit5/marshmallow-jello-o-salad

Marshmallow jello o salad