text editor
Merge branch 'master' of https://github.com/shrishty/Text-Editor