added meteor.js for pebble
changed .gitignore to reflect moved pebble_drone location
pebble final
pebble working!!!!
Merge branch 'akshy'
Merge branch 'master' of https://github.com/afuhrtrumpet/meteorhack14 into akshy
* adding ‘setServer’ roc (call with 0,1)
* adding local warning
Merge branch 'master' of github.com:afuhrtrumpet/meteorhack14 into ben
added IMPACT_VALUE to drone.js for magnitude variations
* wip pubnub
democracy mode foundation added
* fix crash on “client” by wrapping callback in fiber
fix merge
democracy mode added
Merge branch 'master' of https://github.com/afuhrtrumpet/meteorhack14
merge confilct resolvd master<->akshy
fixed rpc userId
Merge branch 'master' of https://github.com/afuhrtrumpet/meteorhack14
fix typo
Merge branch 'akshy'