modified:   teste/src/Teste.java
	new file:   teste/src/Teste.java~
gmm
jghkvb

,
afasfaf
asd
Merge branch 'teste' of https://github.com/vitorsala/demo.git into teste