Adds a triangle
Merge branch 'master' into styles
Changes styles of triangle