Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Mon, 23 Mar 2015 13:36:46 +0000 (09:36 -0400)
committerJim <jim.pryor@nyu.edu>
Mon, 23 Mar 2015 13:36:46 +0000 (09:36 -0400)
* working:
  add some old code, let's review/update before publishing


Trivial merge