Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Fri, 20 Feb 2015 14:19:33 +0000 (09:19 -0500)
committerJim <jim.pryor@nyu.edu>
Fri, 20 Feb 2015 14:19:33 +0000 (09:19 -0500)
* working:
  tweak comment


Trivial merge