initial project version
Merge branch 'master' of http://github.com/SalleMeteor/magic-canvas

this is my merge message