Merge branch 'master' of git://andersk.mit.edu/test

Conflicts:
	test.txt

diff --cc test.txt
index 5716ca5987cbf97d6bb54920bea6adde242d87e6,257cc5642cb1a054f08cc83f2d943e56fd3ebe99..76018072e09c5d31c8c6e3113b8aa0fe625195ca
--- 1/test.txt
--- 2/test.txt
+++ b/test.txt
@@@ -1,1 -1,1 +1,1 @@@
- bar
 -foo
++baz