added thham and retune

kylemcdonald · Jan 3, 2014 · acbad59 · acbad59
1 parent 1a8d9ff
commit acbad59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/memory/content.md b/memory/content.md
@@ -46,6 +46,8 @@
 
 ![devcon](http://distilleryimage8.ak.instagram.com/ca8ac80affcb11e283b822000a9f124c_7.jpg)
 
+* Spoke at [This Happened](http://www.thishappened.org/events/hamburg-4) in Hamburg.
+* Spoke at [Retune Berlin](http://retune.de/2013/), lead a computer vision workshop, and delivered my first one-liner to bring down the house during a panel.
 * Taught "[Appropriating Interaction Technologies](www.creativeapplications.net/reviews/appropriating-interaction-technologies-social-hacking-at-itp/)" with [Lauren McCarthy](http://lauren-mccarthy.com/)
 
 ![ait](http://distilleryimage11.ak.instagram.com/c6f23cc468bb11e39ba112736d69badf_8.jpg)

diff --git a/memory/index.html b/memory/index.html
@@ -148,6 +148,8 @@ <h1>2013</h1>
 <p><img src="http://distilleryimage8.ak.instagram.com/ca8ac80affcb11e283b822000a9f124c_7.jpg" alt="devcon" title=""></p>
 
 <ul>
+<li>Spoke<img src='at.png' class='badge'/><a href="http://www.thishappened.org/events/hamburg-4">This Happened</a> in Hamburg.</li>
+<li>Spoke<img src='at.png' class='badge'/><a href="http://retune.de/2013/">Retune Berlin</a>, lead a computer vision workshop, and delivered my first one-liner to bring down the house during a panel.</li>
 <li>Taught "<a href="www.creativeapplications.net/reviews/appropriating-interaction-technologies-social-hacking-at-itp/">Appropriating Interaction Technologies</a>"<img src='with.png' class='badge'/><a href="http://lauren-mccarthy.com/">Lauren McCarthy</a></li>
 </ul>