First draft
Merge pull request #2 from githubstudent/jordan

Trout + Rosemary Entree
Merge branch 'master' of https://github.com/githubschool/recipes into fish-more

Conflicts:
	trout.md