changed button colors
fixing merge conflicts and changing buttons
Merge branch 'master' of https://github.com/madisonmay/coplay