# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1405406760 14400
# Node ID 9647f01682876416d09693eded1b27e0586e3c31
# Parent  1943a5313f40b17aca8b6c24748cb6a8a0655687
update for interview.

diff -r 1943a5313f40 -r 9647f0168287 org/genesis_demonstration.clj
--- a/org/genesis_demonstration.clj	Mon Jun 16 11:26:41 2014 -0400
+++ b/org/genesis_demonstration.clj	Tue Jul 15 02:46:00 2014 -0400
@@ -62,5 +62,9 @@
 (learn-and-view-touch-regions)
 
 
+;; pokemon yellow total control hack
+(play "/home/r/proj/vba-clojure/video/total-control.mp4")
 
-)
\ No newline at end of file
+
+
+)
diff -r 1943a5313f40 -r 9647f0168287 thesis/org/roadmap.org
--- a/thesis/org/roadmap.org	Mon Jun 16 11:26:41 2014 -0400
+++ b/thesis/org/roadmap.org	Tue Jul 15 02:46:00 2014 -0400
@@ -20,8 +20,9 @@
   - implement stretch goals from Winston if possible
   - complete final formatting and submit
 
-* DONE Turn in CORTEX
-  CLOSED: [2014-05-22 Thu 12:01] DEADLINE: <2014-05-12 Mon>
+<<<<<<< local
+* DONE CORTEX
+  CLOSED: [2014-05-29 Thu 17:01] DEADLINE: <2014-05-09 Fri>
   SHIT THAT'S IN 67 DAYS!!!
 
 ** program simple feature matching code for the worm's segments