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
cleaning up userprefs
this is a test
fixing /scenes/game.unity
Merge pull request #19 from JeremyKooper/master

this is a test