From: Chris <chris.barker@nyu.edu>
Date: Tue, 24 Feb 2015 21:25:27 +0000 (-0500)
Subject: merging edits
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=7e490929c94a664464007a6d850e72959d833d60

merging edits
---

7e490929c94a664464007a6d850e72959d833d60