Added the twitter auth route
Fixed merge conflicts
Fixed error in routes file from the merging