this is cool
Merge branch 'francesca' of https://github.com/ScottLNorvell/sound_ocean into development
Dicoverer tests and such