merged projects part 1
Merge branch 'master' of https://github.com/BTA02/Text_Editor