Merge branch 'master' of https://github.com/CodingStarH/ES

Conflicts:
	test.txt
resolve