test
db stuff
more database work
Merge pull request #1 from ahurley/master

database work
Merge pull request #1 from acstache/master

Pull Request for Will