jorge alterou isto
Merge branch 'master' of https://github.com/manelcouves/testegit

Conflicts:
	teste.txt