Fixed some weird behaviour with the triangles
merging
Merge branch 'master' of github.com:TeamTriangular/Triangular