Added Collidable

changes made by Brennan, added collidable class