Toma Soma
Merge origin/master

Conflicts:
	JavaApplication1/src/javaapplication1/UmaNovaClasse.java