Update lala
Update lala
Merge branch 'master' into teste4

Conflicts:
	lala
Merge pull request #2 from lacbs/teste4

Teste4