database settings
Merge pull request #20 from MiguelRosende/master

database settings