no se que hice

lalalalalalalal
Merge branch 'master' of https://github.com/Ivette14/sistema

Conflicts:
	application/views/form/a_activofijo.php