Improved physics, collision model. Added friction. Still exists bug with energy transfer
Merge into mainline
Added rounded corners to visual model; still need to implement corresponding physics
Reworked physics engine to use energy conservation instead of force application; other minor bug fixes