Front: asignaturas

extraer malla
Merge branch 'master' of https://github.com/MagicBone/fisusm

Conflicts:
	application/controllers/front/general.php
	application/views/front/estilos/asignaturas.php
	css/style_front.css