Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Sun, 5 Apr 2015 23:03:03 +0000 (19:03 -0400)
committerJim <jim.pryor@nyu.edu>
Sun, 5 Apr 2015 23:03:03 +0000 (19:03 -0400)
commite29c7337b6f773946d61881be1e4c5d947563929
treee78d308d226254975af64303d7b430db54c2d5f6
parent01a9357d50333e9ea8fa82aa6fa73283c63a2e44
parent29f30e097b5d2b178a0e0104c41ff53f724e1239
Merge branch 'working'

* working:
  add Juli8-v1.3