added combined database
try again
Merge pull request #4 from hhelterb/master

database