1.1 --- a/org/ideas.org	Thu Jan 16 10:37:11 2014 -0500
     1.2 +++ b/org/ideas.org	Thu Jan 23 11:18:36 2014 -0500
     1.3 @@ -7,6 +7,8 @@
     1.4  #+INCLUDE: ../../aurellem/org/level-0.org
     1.5  #+babel: :mkdirp yes :noweb yes :exports both
     1.6  
     1.7 +
     1.8 +
     1.9  * Ideas
    1.10  
    1.11  This is a list of all the ideas I've had that I felt like writing down
    1.12 @@ -31,11 +33,13 @@
    1.13  getting credit.
    1.14  #+end_quote
    1.15  
    1.16 -<<<<<<< local
    1.17 +- Brain silo :: dyl
    1.18 +
    1.19 +
    1.20  - pronuncation guide :: a simple webpage where you type in a word and
    1.21       it returns a simpe, English sentence describing exactly how to
    1.22       pronounce the word. For people who don't want to learn IPA. 
    1.23 -=======
    1.24 +
    1.25  - learning to teleport :: scifi idea, this is a story about a person
    1.26       who is struggling with his/her society's ideas about
    1.27       teleportation. It's considered a fundamental part of being a
    1.28 @@ -46,13 +50,7 @@
    1.29       eventually transcend via destructive upload. Analogies to jumping
    1.30       off a diving board into a pool (which I simply /could not do/ for
    1.31       a long time), etc.     
    1.32 ->>>>>>> other
    1.33  
    1.34 -<<<<<<< local
    1.35 -- touch vision :: inspired by GelSight, I want to reexamine cortex and
    1.36 -                  see if I could implement touch as a very low range
    1.37 -                  form of vision.
    1.38 -=======
    1.39  - bitcoins for immigrants :: A common case with Mexican immigrants
    1.40       (illegal or not) is that they want to send money they've earned
    1.41       in the US back to their families in Mexico. They currently do this
    1.42 @@ -66,10 +64,7 @@
    1.43       them. Or, perhaps some educational seminars about bitcoin might
    1.44       be in order. There's some money to be made there because there is
    1.45       great demand, and it's a good thing to boot!
    1.46 ->>>>>>> other
    1.47  
    1.48 -<<<<<<< local
    1.49 -=======
    1.50  - reverse eye-tracking :: A painting that is actually a digital screen
    1.51       with a camera. It records people's eye tracks permanently. It's
    1.52       "artistic" because paintings are normally these things that you
    1.53 @@ -157,7 +152,10 @@
    1.54  
    1.55  - aurellem shirt :: I should make an aurellem star symbol tee-shirt. 
    1.56  
    1.57 ->>>>>>> other
    1.58 +- touch vision :: inspired by GelSight, I want to reexamine cortex and
    1.59 +                  see if I could implement touch as a very low range
    1.60 +                  form of vision.
    1.61 +
    1.62  - high school science :: this is a lesson in scientific ethics. The
    1.63       goal is to calculate /g/, the local gravitational
    1.64       acceleration. The students are told that the textbook says it's