starting database module
Merge pull request #2 from pannellr/pannellr

Merge pull request #1 from pannellr/master
Merge pull request #3 from pannellr/master

Pull master updates down