Mmmmm
Merge pull request #1 from githubstudent/ice-cream

Mmmmm
Add info
Merge branch 'master' of https://github.com/githubschool/recipes
Merge branch 'master' of https://github.com/githubschool/recipes
Add first draft
Merge branch 'master' of https://github.com/githubschool/recipes into fish-more

Conflicts:
	trout.md
Merge pull request #17 from githubstudent/fish-more

Fish more