not finished with search in this one yet]
merged with master
Merge branch 'master' of https://github.com/catherinev/OurProject into search2
add commit
i Please enter a commit message to explain why this merge is necessary,
fixed gemfile
delete mistaken search_controller
last try then I'm throwing my computer out the window
added elasticsearch to travis.yml
another searches spec deleted
Merge pull request #44 from catherinev/search2

Search2