Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Tue, 24 Mar 2015 00:51:08 +0000 (20:51 -0400)
committerJim <jim.pryor@nyu.edu>
Tue, 24 Mar 2015 00:51:08 +0000 (20:51 -0400)
commit28e6cb455e0ef803a394d8a3a7017f5d57a6d0d2
tree62976ee035cbcf5c79375e0b0fb4ff6b3dd13603
parentd552ecac62f2a31edd0e6f859eea7cc8fe56db18
parent1ade8f95e78edb0b7dcfd98ad46152d9ad5961b3
Merge branch 'working'

* working:
  symlink doesn't work