Twitter API Database merge
Merge branch 'master' of https://github.com/glu10/Blackmail
After merge