Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Thu, 19 Mar 2015 15:38:32 +0000 (11:38 -0400)
committerJim <jim.pryor@nyu.edu>
Thu, 19 Mar 2015 15:38:32 +0000 (11:38 -0400)
commit66440f9d835c4c1239959776cf1aba72486ae0e8
tree3f32c41356d462049f2d99facd721d1fa402c903
parent1b88cea03535a1442dd33cb166c4aedad6d7d0d0
parent5a4da800fb45e815419971d45ef08988f6ca4220
Merge branch 'working'

* working:
  more local.css updates
  update local.css

Conflicts:
local.css