pom.xml atualizado com junit
Merge branch 'master' of http://www.github.com/nathaliasantos/desafio3
Merge branch 'master' of http://www.github.com/nathaliasantos/desafio3
Merge branch 'master' of http://www.github.com/nathaliasantos/desafio3
Commit
Para dar pull
ola
Merge branch 'master' of http://www.github.com/nathaliasantos/desafio3

Conflicts:
	integrador/src/main/java/integrador/Interpretador.java
	integrador/src/main/java/integrador/teste.java