Count the Shapes Puzzle

The Puzzle:

Count the Shapes

How many triangles are there in this diagram?

Bonus question: How many quadrilaterals?

Do you have the answer? Check against our solution!