merging edits
authorChris <chris.barker@nyu.edu>
Tue, 24 Feb 2015 21:25:27 +0000 (16:25 -0500)
committerChris <chris.barker@nyu.edu>
Tue, 24 Feb 2015 21:25:27 +0000 (16:25 -0500)

Trivial merge