pulling canvas
pulling canvas again
Merge branch 'canvas' of https://github.com/mfbadr/pot-o-gold into dev1