First level editor file
Merge branch 'master' of https://github.com/irishfarmer/editor