facturas
conflictos
Merge remote-tracking branch 'origin/master'

Conflicts:
	Proyecto-Opticas/nbproject/private/private.xml
Merge branch 'master' of https://github.com/iDan245/Proyecto-Opticas---Prog.-Patrones