working on search page
i hate merge conflicts
basic modal search
wooooo a merge message for modal search

Merge branch 'master' of https://github.com/madisonmay/coplay