first commit
	new file:   .gitignore
	modified:   README
	new file:   novinho.txt

	modified:   README
comit de novo
conflito resolvido