git is weird
authorChris <chris.barker@nyu.edu>
Mon, 16 Mar 2015 14:09:16 +0000 (10:09 -0400)
committerChris <chris.barker@nyu.edu>
Mon, 16 Mar 2015 14:09:16 +0000 (10:09 -0400)

Trivial merge