Merge branch 'master' of https://github.com/ScottLNorvell/sound_ocean into francesca
Merge branch 'david' of https://github.com/ScottLNorvell/sound_ocean into sign_in_modal
Add modal
minor edit
Merge branch 'david' of https://github.com/ScottLNorvell/sound_ocean into development
Fix commit and modal magic
Again with the commit issues
add discover song
Modal link
workin' on discoverin
Merge branch 'francesca' of https://github.com/ScottLNorvell/sound_ocean into development
adding modals
adding modal styles
fix