# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1342882982 18000
# Node ID 0efa36180e8a8d7147d3ae77a7521251d6e680ff
# Parent  d37ccb6c888fb787bcb6e75aec031475c7c06314
merge changes from laptop

diff -r d37ccb6c888f -r 0efa36180e8a org/proposal.org
--- a/org/proposal.org	Fri Jul 20 16:40:25 2012 -0500
+++ b/org/proposal.org	Sat Jul 21 10:03:02 2012 -0500
@@ -1,1 +0,0 @@
-
diff -r d37ccb6c888f -r 0efa36180e8a org/thesis.org
--- a/org/thesis.org	Fri Jul 20 16:40:25 2012 -0500
+++ b/org/thesis.org	Sat Jul 21 10:03:02 2012 -0500
@@ -5,6 +5,9 @@
 #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality
 #+SETUPFILE: ../../aurellem/org/setup.org
 
+<<<<<<< local
+* 
+=======
 * COMMENT Multiple senses are compelling for AI.
 #+include: "./intro.org"
 
@@ -54,3 +57,4 @@
   
 * Simulated Imagination
 
+>>>>>>> other