From: Chris <chris.barker@nyu.edu>
Date: Thu, 26 Feb 2015 18:25:29 +0000 (-0500)
Subject: merge working
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=ff8ade136061e84890099464dc05206a8ecaeb98

merge working
---

ff8ade136061e84890099464dc05206a8ecaeb98