Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Fri, 1 May 2015 11:08:36 +0000 (07:08 -0400)
committerJim <jim.pryor@nyu.edu>
Fri, 1 May 2015 11:08:36 +0000 (07:08 -0400)
commit649716384d5e6e1a828d782369a80a80c4ae1a46
treeb75da29fea951124a408372d732e3bda6fbf6caf
parente0aeeda0bf130965c25fdf2171e26d755729b6d8
parent2163ed0b2f0a8388eb5db38343d9bcf824c40c68
Merge branch 'working'

* working:
  Chris' improvement to tc with #