Merge pull request #21 from genjix/master

updated my talk

confirmed/darkwallet.md

@@ -3,18 +3,12 @@
 auth-name       : Amir Taaki
 tag             : freedom, privacy, decentralized
 
-advance costs   : 
-need room       : 
+advance costs   : welcome
+need room       : no
 Location        : London, Barcelona, Paris, wherever
-Can host ppl    : 
+Can host ppl    : maybe
 
 # Dark is here. Dark is freedom.
 
-What doesn't kill you, makes you stronger. The early attempts at shutting down
-centralised file sharing services ended up spawning stronger technology. Like a
-hydra, those in the community that push for individual empowerment are in an
-arms race to equip the people with the tools needed for the next generation of
-global black markets.
-
-edgenet lives safely at the edge of the Internet, on our smart phones. It uses mobile WiFi hotspots to create "cells" for exchanging news and content. Cells talk to cells, asynchronously, covering neighborhoods, and cities. edgenet doesn't exist yet. This project is about building it.
+What doesn't kill you, makes you stronger. The early attempts at shutting down centralised file sharing services ended up spawning stronger technology. Like a hydra, those in the community that push for individual empowerment are in an arms race to equip the people with the tools needed for the next generation of global black markets.