uploaded working db
uploaded merge conflict resolution
Merge pull request #2 from whoisglover/setup_db

uploaded working db