database first commit
2nd commit

Hopefully looks better than the first
Merge pull request #1 from hellfiremarine/master

pull