Add geometry question! WARNING: LOTS OF CHANGES
Merge branch 'master' into feature/geometry-quiz