Merge pull request #4 from tikiking1/database

Database