Insertando nuevos cursos
Merge branch 'master' of https://github.com/ewolves/cenfotec-proyecto-1

Conflicts:
	js/configuracion.js
Merge branch 'master' of https://github.com/ewolves/cenfotec-proyecto-1