change 1
Merge branch 'master' of github.com:endrysan/test

Conflicts:
	test1.txt