hjghg
jgjgh
Primera consulta
Merge branch 'master' of https://github.com/Apstreet/CodeIgniter

Conflicts:
	application/controllers/codigoFacilito.php
	application/controllers/crearDB.php
	application/controllers/principal.php
	application/libraries/Menu.php
	application/views/principal/bienvenido.php
	application/views/principal/head.php
	application/views/principal/headers.php
	application/views/principal/menu.php
	application/views/principal/situacion.php
	application/views/sql/crearDB.php
	css/jmenu.css
	css/nivo-slider.css
	css/style.css
sdfasf