Worked on search query in search controller, made basic form in index.html.erb. made a simple show. Still has an error but it's probably something simple
resolving database.yml conflict