added logo file
styling wip
fixed merge conflict
merging
finished search feature tests; can search with item that exists in db && cannot search for item that doesnt exist
user logging in
Merge branch 'search_bar_test_for_real' of https://github.com/fiery-skippers-2014/its-nacho-problem into search_bar_tests
Merge pull request #22 from fiery-skippers-2014/search_bar_test_for_real

Search bar test for real
fixed merge conflict
merged styling and sessions 29 tests passing
fixed typo
Merge pull request #23 from fiery-skippers-2014/search_bar_tests

Search bar tests

checked test - all passing. gj!
fixed conflict
saving new recipes also saves new ingredients to db; wrote additional recipe controller tests
styles kinda working
Merge remote-tracking branch 'origin/search_bar_test_for_real' into styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into styling
getting the background image and forms where I want them
wrote more user controller tests; able to now get top ten recipes based on missing ingredients
landing page pretty much done