changes in office
Merge remote-tracking branch 'origin/master'

Conflicts:
	Proyecto2Corte/build/classes/DB/RutinaDB.class
	Proyecto2Corte/nbproject/private/private.properties