Merge branch 'teste'

Conflicts:
	src/br/com/projeto/HelloWorld.java