1.1 --- a/org/ideas.org	Sat Nov 30 18:35:37 2013 -0500
     1.2 +++ b/org/ideas.org	Sat Nov 30 18:36:16 2013 -0500
     1.3 @@ -31,10 +31,9 @@
     1.4  getting credit.
     1.5  #+end_quote
     1.6  
     1.7 -<<<<<<< local
     1.8  - candy screw :: edible candy screw with candy nuts that you can screw
     1.9                   as well. 
    1.10 -=======
    1.11 +
    1.12  - better bibliography :: when writing a thesis or paper, have the
    1.13       biblography not just be an opaque list of resources, but have it
    1.14       be a list of /summaries/ and /qualities/ that each paper has in
    1.15 @@ -46,10 +45,7 @@
    1.16       provide information about the referenced papers from the
    1.17       author's perspective. I will use this biblographic form in my own
    1.18       thesis. 
    1.19 ->>>>>>> other
    1.20  
    1.21 -<<<<<<< local
    1.22 -=======
    1.23  - digital inter-library loan :: libraries at universities already do
    1.24       interlibrary loans for books, so why not do the same for access
    1.25       to stupid paywalled digital papers? All the universities could
    1.26 @@ -60,7 +56,6 @@
    1.27       can access the proxy network. Access to the proxy network could
    1.28       be made easy using something like http://libx.org/.
    1.29  
    1.30 ->>>>>>> other
    1.31  - chess visual :: to show the vast size of the game trees considered
    1.32                    by computers, show two people playing chess in a
    1.33                    void. They are floating in space, and there is a