db redone
Merge branch 'master' of github.com:fireblade99/journalgraph
merge fixed