LlamadaLocal.correcto
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/compiler/test/CompilerTest.java