added SQLite DB
added updates to database
resolved conflict
Merge pull request #1 from jbrunton/data-model

Added SQLite-backed data model