started work on database
Merge pull request #1 from elrain/database

started work on database