music player started
Merge branch 'master' into musicPlayer
started music player implementation
Merge branch 'master' into musicPlayer
play, pause, next buttons added for internet radio; started basic radio implementation; adjusted slider to have display progress (optional)
resource file merge conflict resolved
Merge branch 'master' of github.com:CDargis/QitchenHub
playlist modifications
sync with master
volume icons added; music player area made larger
sync with master
basic music player completed; love and ban feature added; slide transition fixed for larger area; location removed from global user settings page; volume implemented for music player
sync with master, merge conflict resolved with resources
moved loved if statement into Song constructor
music player settings started; unlove track now implemented
settings integration for music app
music player COMPLETED
merge conflicts resolved