change colspan
Merge pull request #7 from matthew-chell/dev

change colspan