Add the second mat
Merge remote-tracking branch 'origin/shapes'