Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda

diff --cc alpha.mdwn
index 7db9eee,cd0eeb7..c22ccd4
--- 1/alpha.mdwn
--- 2/alpha.mdwn
+++ b/alpha.mdwn
@@@ -1,3 -1,4 +1,6 @@@
 +prefix line
 +
  testing alpha
+ 
+ 
+ added another line