Merge pull request #2 from SpencerCDixon/db_design

Db design
Merge branch 'master' into db_design