Starting the A pyramid
Merge branch 'master' into testing