updates
some changes
Merge branch 'master' of github.com:thedevshop/dominofm
added pause button to feed items
some changes
updates
updates
spotify test
fixed merge conflict
Merge branch 'feature/artist-pages'
removed dependency
updated gemfile
removed plaything
removed spotify
hey
updates to player
resolved conflicts
updates to player
import spotify playlists upon signup
fixed merge conflict