teste
Revert "Initial commit"

This reverts commit 3fe3da3f35bc4245776d5c01ab49d6cc3f40a6eb.
Revert "Revert "Initial commit""

This reverts commit 1d4e7bcd8b9d086598c7aad54be1ef5a8a5ac04a.
teste tortoise git
teste merge
teste de conflito
q
ewqr
Merge branch 'TESTMERGE'

Conflicts:
	teste/1654684564656545.txt