Fixing DB stuff
Merge pull request #37 from HSkogmo/master

Fixing DB stuff