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)
commit145310e497b03752f7895ab007bf1b4fdd958ad9
treef63b1cfa5f815b4b4c23f716e0ac25706bb61d63
parentbaff59e208a25e6c100f0496153ad2fb587f7b76
parent1f3f3f4cb3dde7a62bc3537a606f4cc7070c04d7
Merge branch 'working'

* working:
  tweak comment