remoçao - wiki
Merge branch 'f2828c6d9f300e36fcf0585052aec30ffca7ea8b'

Conflicts:
	meu projeto.txt