comitando local
Merge branch 'master' of https://github.com/trocolit/gitHubTest

Conflicts:
	test.txt