included canvas code
Merge branch 'Fixing-site'