Merge pull request #50 from jonbonazza/master

animation work
simplified collision system a bit. There is no longer the concept of BoxCollider and CircleCollider. Just a general Collider whose CollisionShape implementation determines its type. This keeps it more consistent with the RigidBody system.