merge conflicts
merge conflicts
merge conflicts
Merge remote-tracking branch 'upstream/master'
merge conflict
Merge remote-tracking branch 'upstream/master'
merge from upstream master
cleared white space
Added PlaylistVC. Need to pass selected Artist to tableview.
Added PlaylistVC. Need to pass selected artist to its tableView
Merge
Added PlaylistVC, need to pass selected Artist to its tableView
merge
PlaylistVC added, need to pass selected artist to its tableView
Need to pass Artist to PlaylistVC
Merge pull request #6 from brmendez/master

Setting up PlaylistVC