para Merge
Merge branch 'master' of https://github.com/lerv22/SISCFJ

Conflicts:
	Sistema/web/session/creacionCliente.jsp
	Sistema/web/session/modificarCliente.jsp
Merge branch 'master' of https://github.com/lerv22/SISCFJ

Conflicts:
	Sistema/web/session/creacionCliente.jsp
	Sistema/web/session/modificarCliente.jsp
Merge branch 'master' of https://github.com/lerv22/SISCFJ

Conflicts:
	Sistema/web/session/creacionCliente.jsp
	Sistema/web/session/modificarCliente.jsp
Cambios en citas
Merge branch 'master' of https://github.com/lerv22/SISCFJ

Conflicts:
	Sistema/web/WEB-INF/tags/navSide.tag
	Sistema/web/session/agregarCita.jsp
	Sistema/web/session/cancelacionCita.jsp
	Sistema/web/session/confirmacionCita.jsp
	Sistema/web/session/modificarCliente.jsp
	Sistema/web/session/principal.jsp