seeded out playlists not created by user (ie- nil playlists)
Merge branch 'master' into working_on_tables

Conflicts:
	app/models/playlist.rb
	app/models/playlist_song.rb
	app/models/song.rb
Merge branch 'working_on_tables'

Conflicts:
	app/models/playlist.rb