Merge pull request #2 from stephenhmarsh/master

got a random under construction background going
for merge
Merge branch 'master' of github.com:alexshook/pair_project
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
minor change
resolving database.yml conflict
latest search form
minor layout fixes