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

Conflicts:
	sucursal1.xml
	sucursal2.xml