changes pc-local
Merge branch 'master' of https://github.com/fredy-aunta/avanzada

Conflicts:
	Proyecto2Corte/nbproject/private/private.xml