13:46
13:47
13:48
Merge branch 'teste'

Conflicts:
	readme-teste.txt

oioioi