# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1390493916 18000
# Node ID 8bd81d22ae93428786640854cc629264b19195c9
# Parent  41741f76b56760cb91b4dbe584e74c61a4fd9051
add brain silo; merge.

diff -r 41741f76b567 -r 8bd81d22ae93 org/ideas.org
--- a/org/ideas.org	Thu Jan 16 10:37:11 2014 -0500
+++ b/org/ideas.org	Thu Jan 23 11:18:36 2014 -0500
@@ -7,6 +7,8 @@
 #+INCLUDE: ../../aurellem/org/level-0.org
 #+babel: :mkdirp yes :noweb yes :exports both
 
+
+
 * Ideas
 
 This is a list of all the ideas I've had that I felt like writing down
@@ -31,11 +33,13 @@
 getting credit.
 #+end_quote
 
-<<<<<<< local
+- Brain silo :: dyl
+
+
 - pronuncation guide :: a simple webpage where you type in a word and
      it returns a simpe, English sentence describing exactly how to
      pronounce the word. For people who don't want to learn IPA. 
-=======
+
 - learning to teleport :: scifi idea, this is a story about a person
      who is struggling with his/her society's ideas about
      teleportation. It's considered a fundamental part of being a
@@ -46,13 +50,7 @@
      eventually transcend via destructive upload. Analogies to jumping
      off a diving board into a pool (which I simply /could not do/ for
      a long time), etc.     
->>>>>>> other
 
-<<<<<<< local
-- touch vision :: inspired by GelSight, I want to reexamine cortex and
-                  see if I could implement touch as a very low range
-                  form of vision.
-=======
 - bitcoins for immigrants :: A common case with Mexican immigrants
      (illegal or not) is that they want to send money they've earned
      in the US back to their families in Mexico. They currently do this
@@ -66,10 +64,7 @@
      them. Or, perhaps some educational seminars about bitcoin might
      be in order. There's some money to be made there because there is
      great demand, and it's a good thing to boot!
->>>>>>> other
 
-<<<<<<< local
-=======
 - reverse eye-tracking :: A painting that is actually a digital screen
      with a camera. It records people's eye tracks permanently. It's
      "artistic" because paintings are normally these things that you
@@ -157,7 +152,10 @@
 
 - aurellem shirt :: I should make an aurellem star symbol tee-shirt. 
 
->>>>>>> other
+- touch vision :: inspired by GelSight, I want to reexamine cortex and
+                  see if I could implement touch as a very low range
+                  form of vision.
+
 - high school science :: this is a lesson in scientific ethics. The
      goal is to calculate /g/, the local gravitational
      acceleration. The students are told that the textbook says it's