added basic search functionality
fixed merge conflict due to added search form in index.erb