sec
ter
Merge branch 'master' of https://github.com/paulofernando1512/teste

Conflicts:
	teste.txt