Colspan to table
Merge branch 'master' of github.com:CanvasHS/canvashs.github.io