Added playlist object
fixed merge errors
made changes for the pull request
more fixes for pull request
Merge pull request #26 from bryansills/master

Added playlist object