added canvas class test
Merge branch 'master' of https://github.com/charleslockner/eclass
Merge remote-tracking branch 'origin/master'