added stock recipes
fixed merge conflict on services page
Merge pull request #14 from margaretgodowns/master

fixed services merge conflict