testing canvas
Merge branch 'master' into twang35
TapThat 1.0