teste
Merge branch 'master' of https://github.com/ruinpsilva/P3
Merge branch 'master' of https://github.com/ruinpsilva/P3

Conflicts:
	testeFile.html