starts building out omniauth structure and routes
fixes merge conflict
creates files for twitter and facebook API calls
took notes on facebook
root page shows, switching to twitter oauth attempts
Merge pull request #9 from ilanasufrin/ben_branch

Ben branch
twitter notes
merge conflicts
Merge pull request #10 from ilanasufrin/ilana

Ilana
twitter login working
fixes merge conflicts
Merge pull request #11 from ilanasufrin/emily

Emily
Adds nav bar partial, adds friends and recent pages and routes