versao 3
Merge branch 'master' of https://github.com/fmouta/Repo1

Conflicts:
	a.txt