add
Merge branch 'master' of https://github.com/ItemRendaro/Test

Conflicts:
	test.txt