fixed corner collisions
Merge branch 'master' of https://github.com/TerranceN/ATA_Coop_Hackathon