arreglos
Merge branch 'master' of https://github.com/dmsierra11/FranquiciaApp

Conflicts:
	src/franquiciaapp/XMLInventario.java