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

Conflicts:
	src/Sockets/Replicador.java
	sucursal1.xml