Added back in Terrain class, made killbox generic to any object
Resolved merge conflicts