Grid layout
Merge branch 'master' of https://github.com/scubbasteve302/QRiosity into steven

Merge master
Update framework
Merge pull request #5 from scubbasteve302/steven

Steven