working on trying to send a request to twitter
giving up on twitter to start on bootstrap
adds bootstrap files
having merge conflicts
Merge pull request #14 from ilanasufrin/ilana

Ilana
sets up bootsrap in the asset pipeline and links to jquery
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge pull request #15 from ilanasufrin/ilana

sets up bootsrap in the asset pipeline and links to jquery
Merge pull request #16 from ilanasufrin/emily

API REQUEST AUTHENTICATES LIKE A MOTHERFUCKER
adding bootstrap support for older IE browsers
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge pull request #17 from ilanasufrin/ilana

just bootstrap support
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Adds link to wireframe mockups on google docs
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Merge pull request #18 from ilanasufrin/ben_branch

Ben branch
Merge pull request #19 from ilanasufrin/emily

MOTHERFUCKING GEOCODER IN THE HOUSE
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
twilio initial commit
Merge pull request #20 from ilanasufrin/ilana

Ilana