TEST MERGE ON EDITOR
Merge branch 'master' of https://github.com/lordgift/try_git.git

Conflicts:
	egittest/src/Abc.java