asdasd
Merge branch 'versao_0.1.2'

Conflicts:
	index2.txt