starts building out omniauth structure and routes
fixes merge conflict
root page shows, switching to twitter oauth attempts
twitter login working
fixes merge conflicts
Merge pull request #11 from ilanasufrin/emily

Emily