merging remote branch with local master
merging
fixed merge conflict
fixed merge conflict
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
fixed user sign up with restful routes; 2 sign up feature tests
finished search feature tests; can search with item that exists in db && cannot search for item that doesnt exist
Merge pull request #22 from fiery-skippers-2014/search_bar_test_for_real

Search bar test for real