Merge branch 'master' of ssh://animus.robocracy.org/srv/git/dotfiles

Conflicts:
	.fluxbox/init
	.xinitrc
	todo

1 files changed, 50 insertions, 2 deletions

diff --git a/todo b/todo
index 0454a6d..2c19785 100644
--- a/todo
+++ b/todo
@@ -1,5 +1,53 @@
-the international
-choke
+http://dsc.discovery.com/videos/prototype-this-couch-mobile-ride.html
+http://dsc.discovery.com/videos/prototype-this-six-legged-atv.html
+http://dsc.discovery.com/videos/prototype-this-traffic-busting-truck.html
+
+
+projections:
+ color photo finder
+ fix natural unit number finder
+ real time photo of visitor -> database photo? style?
+
+solid state density?
+email sahughes
+
+SICP readings for 6.945: get from okie?
+
+i no longer hear the music (the kinks?)
+
+notes from 4.602 on 2/9/9:
+development of urban grids from roman garrison towns (paris, britain)
+------------------
+only show appropriate entries/artifacts on journal (eg authentication)
+
+hole up somewhere plan:
+$$$ flights to morocco, iceland, paris, zurick, sf, seattle, etc?
+christine, seo, lily, mike, 
+
+install docutils
+
+look up ref 11:
+Foundations of Applied Superconductivity (1991, Orlando and Delin)
+50 nH vs 1 nH
+
+Reduced Complexity Decoding of Coded Pulse-Position Modulation Using Partial Statistics
+The Interplanetary Network Progress Report (2005)
+
+---------------------------------------
+
+sage math olpc
+
+blog concept: write emails to dead or fictional figures in character, eg
+    asking questions, and see if the account owner responds
+
+need tools to tinker with human brain, nervous system
+
+video-pedia: allow collaborative editing of informative video. multiple
+    lengths, versions for each topic? what would everything2 version
+    look like?
+
+-------
+
 last tango in paris, bande a part, showgirls, the lovers, day for night
 
 check on CMU transfer credit status