solved db and pitchfork conflicts
Merge pull request #37 from chiaS/master

solved db and pitchfork conflicts