Added collision resolution, and modified the elasticities of the objects.