database working
Merge pull request #2 from klesse413/jm

database working