changeset 69:2097f7685a3b

merge.
author Robert McIntyre <rlm@mit.edu>
date Sun, 13 Oct 2013 12:09:05 -0400
parents 86b9eb9afc3e (diff) 036fe1b13120 (current diff)
children ed7d0ca99c55
files org/ideas.org
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/ideas.org	Fri Oct 04 14:49:04 2013 -0400
     1.2 +++ b/org/ideas.org	Sun Oct 13 12:09:05 2013 -0400
     1.3 @@ -31,6 +31,8 @@
     1.4  getting credit.
     1.5  #+end_quote
     1.6  
     1.7 +- aurellem shirt :: I should make an aurellem star symbol tee-shirt. 
     1.8 +
     1.9  - high school science :: this is a lesson in scientific ethics. The
    1.10       goal is to calculate /g/, the local gravitational
    1.11       acceleration. The students are told that the textbook says it's