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
fixed merge conflict
merged styling and sessions 29 tests passing