last changes
Merge branch 'master' of https://github.com/jrlveliz/compiladores

Conflicts:
	Compiler.java