Cambio de F por f
Merge branch 'master' of https://github.com/estrategasdigitales/nidoran

Conflicts:
	application/views/tianguis/index.php