twitter auth works
Resolving Merge conflicts