Merge pull request #10 from Gerb11/master

Changed the squares to trianges, and made them stick.
updating
hinge fixes / cannon fires triangles
Merge pull request #12 from mkirk8/addCannon

hinge fixes / cannon fires triangles
using theirs
adding first playable attraction script. still pretty janky and they dont fully lineup but they connect
Merge pull request #13 from JeremyKooper/master

adding first playable attraction script. still pretty janky and they don...
Merge branch 'master' of github.com:TeamTriangular/Triangular
removing .userprefs and updating gitignore file
Merge pull request #14 from wroy/master

revmoing .userprefs file, updating gitignore
imporved mass and gravity/clipping physics
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
Merge pull request #17 from wroy/master

resolved more conflicts. Triangles unfortunately have unusual behavior
Fixed some weird behaviour with the triangles
merging
Merge branch 'master' of github.com:TeamTriangular/Triangular