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
Cleaning up file house
Merge branch 'adding_devise' of https://github.com/ScottLNorvell/sound_ocean into adding_devise
Omniauth magic and devise
fixing user_spec conflict