Odio el vallenaton
Merge branch 'master' of https://github.com/GraLucena/SucursalApp

Conflicts:
	.gitignore
	build/built-jar.properties
Historial
Merge branch 'master' of https://github.com/GraLucena/SucursalApp

Conflicts:
	.gitignore
	build/built-jar.properties
	nbproject/private/private.properties
	src/sockets/Replicador.java
	src/sucursalapp/Coordinador.java
	src/sucursalapp/SucursalApp.java