fixing control points
resolving conflicts
physics still need work but triangles are behvaing normally again
Merge pull request #24 from JeremyKooper/master

Fixed the triangles so they connect again