Merge pull request #15 from wroy/master

imporved mass and gravity/clipping physics
triangles now lock to grid

Triangles now to a lock to a grid rather then creating hinges. The
triangles now also rotate to face the triangle they want to attatch to.
Physyics still acts a little wonky so the triangles still take to long
to lock in and the physics are still floaty.
hopefully fixed merge conflicts
resolving conflicts
reaolved more conflicts. Triangles unfornutately have unusualy behaviour