make collidables rectangles so we can just use "intersects"

also fix a collision issue between players when one player is over the
edge
Merge branch 'master' of https://github.com/mitch3a/SuperMarioWar.git