mas cambios
Merge branch 'master' of https://github.com/nerdytrust/quiencompro

Conflicts:
	application/views/facturas.php