merging
switching branch
merging
mergin master to local
feature test for searching recipes
added missing ingredients in recipe search
added feature test for missing ingredient feature
removed debugger from feature test
Merge pull request #26 from fiery-skippers-2014/searching_recipes

Searching recipes
Merge branch 'master' into pantry

just making sure no merge conflicts