cosas de netbeans

espero no afecte
Merge remote-tracking branch 'origin/master'

Conflicts:
	Compilador Pascal-tec/compiladorapp/nbproject/private/private.xml