added database.php again
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev