TESTE

Teste de commit.
Teste 2
Merge branch 'master' of https://github.com/phellipeperin/Sandbox

Conflicts:
	.metadata/.mylyn/repositories.xml.zip

.metadata/.plugins/org.eclipse.core.resources/.projects/ProjetoTeste/.ma
rkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/ProjetoTeste/.sy
ncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTem
pFiles/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTem
pFiles/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1882672069.index
	.metadata/.plugins/org.eclipse.jdt.core/3000285004.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	ProjetoTeste/.classpath
	ProjetoTeste/src/phperin/com/teste/Main.java