Replaced canvas parent with grid
Merge branch 'master' of https://github.com/marksvdev/02350Project.git