ok
Merge branch 'master' of https://github.com/niuskamora/Page

Conflicts:
	recursos/img/9.jpeg

	modified:   administrator/crearadmin.php
	modified:   administrator/crearinfo.php
	modified:   administrator/crearsucursal.php
	modified:   administrator/editaradmin.php
	modified:   administrator/editarinfo.php
	modified:   administrator/editarproducto.php
	modified:   administrator/editarsucursal.php
	modified:   administrator/versucursal.php
	new file:   maqueta - copia.php
	modified:   maqueta.php
	new file:   maqueta2.php
	modified:   nosotros.php
	new file:   recursos/css/bg_noise.png
	new file:   recursos/css/bg_stitch.png
	new file:   recursos/css/liteaccordion.css
	modified:   recursos/funciones.php
	modified:   recursos/img/12.jpeg
	new file:   recursos/img/14.png
	new file:   recursos/img/15.png
	renamed:    recursos/img/12.jpeg -> recursos/img/16.jpeg
	modified:   recursos/img/17.jpeg
	modified:   recursos/img/18.jpeg
	modified:   recursos/img/19.jpeg
	new file:   recursos/img/2.jpeg
	new file:   recursos/img/20.png
	new file:   recursos/img/21.jpeg
	new file:   recursos/img/22.jpeg
	new file:   recursos/img/23.png
	new file:   recursos/img/24.jpeg
	new file:   recursos/img/25.jpeg
	modified:   recursos/img/7.jpeg
	modified:   recursos/img/acerca.jpeg
	new file:   recursos/img/informacion/CMjzK.jpeg
	renamed:    recursos/img/9.png -> recursos/img/informacion/HMgxL.png
	new file:   recursos/img/informacion/IXqDI.jpeg
	new file:   recursos/img/informacion/LNtXq.jpeg
	new file:   recursos/img/informacion/SasQ.jpeg
	new file:   recursos/img/informacion/WlCmG.jpeg
	new file:   recursos/img/informacion/mVEss.jpeg
	new file:   recursos/img/java_logo.jpg
	new file:   recursos/js/jquery.easing.1.3.js
	new file:   recursos/js/liteaccordion.jquery.js
	new file:   recursos/js/liteaccordion.jquery.min.js
	new file:   servicios.php

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	recursos/img/9.jpeg.BACKUP.2184.jpeg
	recursos/img/9.jpeg.BACKUP.4588.jpeg
	recursos/img/9.jpeg.BASE.2184.jpeg
	recursos/img/9.jpeg.BASE.4588.jpeg
	recursos/img/9.jpeg.LOCAL.2184.jpeg
	recursos/img/9.jpeg.LOCAL.4588.jpeg
	recursos/img/9.jpeg.REMOTE.2184.jpeg
	recursos/img/9.jpeg.REMOTE.4588.jpeg
	recursos/img/9.jpeg.orig
	recursos/img/9.jpg