Cover the two currently missing intersection cases for grid layout
Merge branch 'feature/issue-5-basic-grid-system' of github.com:praekelt/sapphire into feature/issue-5-basic-grid-system