starts building out omniauth structure and routes
fixes merge conflict
root page shows, switching to twitter oauth attempts
Merge pull request #10 from ilanasufrin/ilana

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

Emily
working on trying to send a request to twitter
validates current user on all pages but root
Merge pull request #12 from ilanasufrin/emily

validates current user on all pages but root
Adds nav bar partial, adds friends and recent pages and routes
Adds nav bar partial, adds friends and recent pages and routes
Merges from master
Fixes up nav bar partial
Merge pull request #13 from ilanasufrin/ben_branch

Ben branch
giving up on twitter to start on bootstrap
adds bootstrap files
having merge conflicts