Merge pull request #5 from tikiking1/master

Merge pull request #4 from tikiking1/database
Merge pull request #6 from tikiking1/database

Merge pull request #5 from tikiking1/master