cambio sal
Merge branch 'master' of https://github.com/kontramundo/medical_clinic

Conflicts:
	application/views/templates/header.php