Feature/exercise grids

Merged Ned Coltman requested to merge feature/exercise-grids into master

Merge request reports