merging remote branch with local master
merging
Merge pull request #19 from fiery-skippers-2014/master

Merge pull request #18 from fiery-skippers-2014/recipe_search
fixed merge conflict
able to find_recipe_by_pantry
able to compare our pantry to recipe_components
Merge branch 'recipe_search' of https://github.com/fiery-skippers-2014/its-nacho-problem into recipe_search
all user model tests passing
Merge pull request #20 from fiery-skippers-2014/recipe_search

Recipe search
Adding pg search gem and into the model
created neccesary migration for dmetaphone and trigram to function
pg_search now working
made search function more specific
fixed merge conflict
i made the search function even better
Merge pull request #21 from fiery-skippers-2014/search_bar

checked. all tests passing.
fixd merge conflict
added rack session gem; doing capybara test for search
getting ready to fix: all routes, user sessions and authentication
commented (your pantry) out from index; made nested resources for ingredients; wrote feature test for sign up