init commit
added file3
added file2
editagain
Merge branch 'master' of https://github.com/kineticjs/project1