First commit
Merge branch 'master' of github.com:martme/editor
Merge with github repo