convert to spaces for tabs
Merge pull request #93 from eugenefilimonov/try_flip

Try flip
resolve conflicts
first oojs tests pass
implement working search bar on dishes
tests pass before search
reactivate failing tests to see pass
Merge pull request #95 from eugenefilimonov/better_search

Better search
edit test for travis
tests pass inoojs
Merge branch 'master' into try_flip
Merge pull request #96 from eugenefilimonov/better_search

edit test for travis
photo controller specs
getting data back from search
finish photo controller specs
remove save and open debug line
set user to nil for logged out
Merge pull request #97 from eugenefilimonov/photo_cont_specs

Photo cont specs
xhr search
Merge branch 'master' into try_flip