editing user_spec
conflict fix
Merge branch 'development' of https://github.com/ScottLNorvell/sound_ocean into david
creating playlist_song joiner table
deleting discovery.rb
adding user has many playlists association
adding ranking and jquery ui in require tree
Merge branch 'master' of https://github.com/ScottLNorvell/sound_ocean into david
starting modal functionality
conflict fix
minor edit
Merge branch 'david' of https://github.com/ScottLNorvell/sound_ocean into development