Merge commit 'a91bc2f2c3541d706afdb062f9c26c244408c20e'

Conflicts:
	src/compilador/Compilador.java