Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Tue, 7 Apr 2015 00:05:06 +0000 (20:05 -0400)
committerJim <jim.pryor@nyu.edu>
Tue, 7 Apr 2015 00:05:06 +0000 (20:05 -0400)
commit15cd3aa71d183a77137b122f09d6f0a023d1043c
tree9845687f381f8dd71ee58dbdc490d2d9989176a0
parentec5d55d816c093f1908565d576e16f910620107a
parentdd98ec7de6932ef9d278c191fe23d93bdaebbdb5
Merge branch 'working'

* working:
  update juli8 to 1.4

Conflicts:
index.mdwn
index.mdwn