added logo file
styling wip
fixed merge conflict
merging
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
Merge pull request #23 from fiery-skippers-2014/search_bar_tests

Search bar tests

checked test - all passing. gj!