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)
commitc7724ab43624fa37c971971f40799c2d5527fac0
tree60a5d9605f3cfd1afbd3f4cc20f6bdffdb37649a
parent354c433a7006dbf4b285257e28fbb7236436962e
parent4f35315db125b1860395e1d9f5b9b816dc7170c9
Merge branch 'working'

* working:
  add some old code, let's review/update before publishing