novo 1 comiti
Merge branch 'Novo1'

Conflicts:
	new  1.txt