Single User Table and Twitter OAuth
Merge conflict