versao2

versao2
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml
	feminino.html
	images/Thumbs.db
	images/boy.png
	images/girl.jpg
	index.html
	masculino.html
	monkey.html
	sexo.html