Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Sat, 4 Apr 2015 15:41:31 +0000 (11:41 -0400)
committerJim <jim.pryor@nyu.edu>
Sat, 4 Apr 2015 15:41:31 +0000 (11:41 -0400)
* working:
  add/update monad code


Trivial merge