Pillar normal map fixed fo realz
Nah, just kidding
Merge remote-tracking branch 'origin/master' into Shuriken-collisions