work on edit drop down
Merge branch 'master' of github.com:dshamis317/valence
playlist update route fixed
gemfile merge conflicts resolved