teste

Signed-off-by: RenatoFloresLima <renatofloreslima@gmail.com>
crreção de comflito

Signed-off-by: RenatoFloresLima <renatofloreslima@gmail.com>
Merge branch 'master' of
https://github.com/RenatoFloresLima/HelloWorld.git

Conflicts:
	HelloWorld/src/Teste2.java


Signed-off-by: RenatoFloresLima <renatofloreslima@gmail.com>