Merge pull request #21 from trodrigues/patch-3

Added Aral Balkan's talk
grand-decentral-station · Oct 29, 2013 · acfb2e4 · acfb2e4
2 parents 3cdd84c + 4144418
commit acfb2e4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/concept/links.md b/concept/links.md
@@ -39,6 +39,7 @@ This document is a collection of links to all kinds of resources, which could be
 - http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/ 
 - https://github.com/feross/webtorrent
 - https://arkos.io/
+- http://www.youtube.com/watch?v=G1QCBzQ0aNc - Aral Balkan's talk on Digital Feudalism
 
 ## Similar goals
 - http://decentralizer.com/ (thoughts from https://twitter.com/stevenf)