Began work on updating the collsion system
fixed collision system

no longer need 2 different object types for x and y collisions
test
Revert "fixed collision system"

This reverts commit fdf9ef5345d8ca67bab60d58eb7cb5447246829d.