fixed db, needs work on queries
Merge pull request #5 from twurz/master

fixed db, needs work on queries