* server/client should work better
* keep roc’s around
Fixed merge conflict
fix merge confilct
* using pubnub in a sane way
* simplify pubnub
* fixing timing bug
* should be able to clear emergency, untested
* ‘emergency’ no longer takes off
* soften impact
merge ben into master
Merge branch 'alex' into akshy
democracy chat
Made button clicking prettier
Easy merge fix
* nerf speeds
pebble->meteorfliesdrone.meteor.com
Merge branch 'master' of github.com:afuhrtrumpet/meteorhack14
merged master to branch
Broke pebble