Data model and wireframe
Merge branch 'development' of https://github.com/ScottLNorvell/sound_ocean into francesca
Merge branch 'development' of https://github.com/ScottLNorvell/sound_ocean into francesca
user spec missing, going to find it
changing new.html.erb file
Cleaning up file house
Merge branch 'adding_devise' of https://github.com/ScottLNorvell/sound_ocean into adding_devise
Omniauth magic and devise
david hi-main
this is cool
Merge branch 'francesca' of https://github.com/ScottLNorvell/sound_ocean into development
Dicoverer tests and such
conflict fix
fix user relationships
Merge branch 'development' of https://github.com/ScottLNorvell/sound_ocean into david
creating playlist_song joiner table