Implemented Collider class with inheritance for AABB and capability of new colliders (OBB, surfaces). Implemented a PhysicsComponent struct.
Fixed merge conflict