working on getting songs to display. still not working
Merge remote-tracking branch 'origin/master'