# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1388289720 18000
# Node ID c3570ed77c8dbcfcc7964d71ec5803b615a4f822
# Parent  8714919e1e529a50c82447029a19844bc32f9fe9# Parent  8e9e811d3f76b7f62f0bf69f813a2110667bdc7b
merge.

diff -r 8e9e811d3f76 -r c3570ed77c8d org/steph.org
--- a/org/steph.org	Thu Dec 19 00:52:39 2013 -0500
+++ b/org/steph.org	Sat Dec 28 23:02:00 2013 -0500
@@ -4,8 +4,6 @@
 #+setupfile: ../../aurellem/org/setup.org
 #+include: ../../aurellem/org/level-0.org
 
-
-
 [[../images/steph.jpg]]
 
 #+begin_src clojure :results output :exports both
@@ -25,5 +23,5 @@
 #+results:
 : 7906 days.
 
-Goodbye Stephanie. I will miss you always.
+Goodbye Stephanie. I will miss you.