Andamento do escopo.
Merge branch 'master' of https://github.com/maico-smaniotto/prog1

Conflicts:
	Escopo.java