updating
using theirs
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
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
merging
Merge branch 'master' of github.com:TeamTriangular/Triangular
cleaning up userprefs
fixing /scenes/game.unity
Merge pull request #19 from JeremyKooper/master

this is a test
Added comments, changed triangle
Merge pull request #20 from Gerb11/master

Added comments, changed triangle dimensions