Organizando o Git
Organizando o Git
Merge branches 'DevThiago' and 'master' into DevThiago

Conflicts:
	main