fixing canvas
Merge branch 'benChang'
Merge branch 'master' of https://github.com/twang35/TapThat