primerio commit
segundo commit
merge
int a
teste1
metodo
Merge branch 'a'
z
Conflicts:
	bin/teste2.class
	src/teste2.java
Merge branch 'master' of https://github.com/jabez/ProjetoNexxera.git
a