Implemented Canvas
Merge branch 'master' of https://github.com/pbardea/enghack
Incorporated Canvas