working on db
Merge branch 'master' of https://github.com/mnicole/gone_in
saving to db
fix merge conflicts