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
Merge branch 'master' of https://github.com/ScottLNorvell/sound_ocean into francesca
start controller
add songs controller
adding ranking and jquery ui in require tree
Merge branch 'master' of https://github.com/ScottLNorvell/sound_ocean into david
Merge branch 'david' of https://github.com/ScottLNorvell/sound_ocean into sign_in_modal
working on models
starting modal functionality
Add modal
conflict fix
minor edit
Merge branch 'david' of https://github.com/ScottLNorvell/sound_ocean into development
Fix commit and modal magic
Again with the commit issues