teste conflito
1
Merge branch 'master' of https://github.com/devairdarolt/Teste

Conflicts:
	README.md