Merge pull request #20 from rmoshier/callap

Callap
we have a wave
started trying to save to database
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
Merge branch 'master' into callap