my 2nd edit
as
Merge branch 'master' of https://github.com/ilyaso/Text-Editor

Conflicts:
	new class mine.txt