1.1 --- a/org/index.org	Sat Jul 13 03:01:04 2013 -0400
     1.2 +++ b/org/index.org	Sat Jul 13 08:03:56 2013 +0100
     1.3 @@ -8,9 +8,14 @@
     1.4  #+OPTIONS: toc:nil, num:nil
     1.5  
     1.6  ** Adventures in coding
     1.7 +<<<<<<< local
     1.8 +- [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
     1.9 +- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
    1.10 +=======
    1.11    - [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
    1.12    - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
    1.13  
    1.14 +>>>>>>> other
    1.15  ** Academic
    1.16    - [[../dylan/html/quandary.html][Bugs in quantum mechanics]]
    1.17    - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]]
    1.18 @@ -18,6 +23,27 @@
    1.19    - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]]
    1.20  
    1.21  ** Cortex: a virtual world for sensate AI 
    1.22 +<<<<<<< local
    1.23 +1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
    1.24 +2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
    1.25 +3. [[../cortex/html/world.html][Creating a Virtual World]]
    1.26 +4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]]
    1.27 +5. [[../cortex/html/games.html][ Showing off: Games and Examples]]
    1.28 +6. *Sensors and effectors*
    1.29 +   1. [[../cortex/html/sense.html][Preamble: auxillary functions]]
    1.30 +   2. [[../cortex/html/body.html][Building a Body]]
    1.31 +   3. [[../cortex/html/vision.html][Vision]]
    1.32 +   4. [[../cortex/html/hearing.html][Hearing]]
    1.33 +   5. [[../cortex/html/touch.html][Touch]]
    1.34 +   6. [[../cortex/html/proprioception.html][Proprioception]]
    1.35 +   7. [[../cortex/html/movement.html][Movement]]
    1.36 +   8. [[../cortex/html/integration.html][Integration]]
    1.37 +7. [[../cortex/html/gabor.html][Gabor Filters]]
    1.38 +
    1.39 +** Quantitative design
    1.40 +- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement
    1.41 +  for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]].
    1.42 +=======
    1.43    1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
    1.44    2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
    1.45    3. [[../cortex/html/world.html][Creating a Virtual World]]
    1.46 @@ -34,6 +60,7 @@
    1.47       8. [[../cortex/html/integration.html][Integration]]
    1.48    7. [[../cortex/html/gabor.html][Gabor Filters]]
    1.49    
    1.50 +>>>>>>> other
    1.51  ** Pok\eacute{}mon
    1.52    - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]]
    1.53    - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]]
    1.54 @@ -43,9 +70,16 @@
    1.55    - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]]
    1.56  
    1.57  ** Thoughts
    1.58 +<<<<<<< local
    1.59 +- [[../dylan/html/science.html][Science Minus Science]]
    1.60 +- [[../thoughts/html/man-years.html][A Universe of Human Experience]]
    1.61 +- [[../thoughts/html/emacs-password.html][Emacs Password Security]]
    1.62 +- [[../server/html/server.html][The Server Culture]]
    1.63 +- [[../thoughts/html/patents.html][Thoughts on Patents]]
    1.64 +=======
    1.65    - [[../dylan/html/science.html][Science Minus Science]]
    1.66    - [[../thoughts/html/man-years.html][A Universe of Human Experience]]
    1.67    - [[../thoughts/html/emacs-password.html][Emacs Password Security]]
    1.68    - [[../server/html/server.html][The Server Culture]]
    1.69    - [[../thoughts/html/patents.html][Thoughts on Patents]]
    1.70 -  - [[../thoughts/html/ideas.html][Ideas]]
    1.71 \ No newline at end of file
    1.72 +  - [[../thoughts/html/ideas.html][Ideas]]>>>>>>> other