aaa
aaaa
Merge branch 'branches/1.1.0'

Conflicts:
	Novo Documento de Texto.txt