Merge pull request #12 from hipsterwannabe/ashwebb

DB Work
Merge branch 'master' of github.com:hipsterwannabe/babytracker into ashwebb