cambio IP
cambio ip
Merge branch 'master' of https://github.com/niuskamora/Page

Conflicts:
	administrator/editarproducto.php
	administrator/versucursal.php
	recursos/img/12.jpeg
	recursos/img/17.jpeg
	recursos/img/18.jpeg
	recursos/img/19.jpeg

	modified:   administrator/editarproducto.php
	modified:   administrator/versucursal.php