Count the Shapes Puzzle - Solution

The Puzzle:

Count the Shapes
How many triangles and quadrilaterals are there in this diagram?

Our Solution:

64 Triangles
36 Quadrilaterals
Total: 100 shapes.
Puzzle Author: Stephen Froggatt

See this puzzle without solution
Discuss this puzzle at the Math is Fun Forum