Commit before merge
Merge
Fixed cellForRow on PlaylistVC
commit before pull
commit before merge
merge before pull
commit before pull
gitignore added, DS_Store now banished
gitignore added, DS_Store added and is now banished
Deleted DS_Store file
-
-merge conflicts