merging again
canvas sizing issues
Merge branch 'master' of https://github.com/dgershte/squiggle

shalala